hello! the git conflict issues seem to have made their way _into_ the file content. you can see what i'm talking about by looking here: https://github.com/search?q=repo%3AWizqdev%2FOpenX+%3C%3C%3C%3C%3C%3C%3C&type=code 