removing conflitct from xml file
removing conflitct from xml file again