Testint merge conflicts with XML file