Fixed merge conflicts in xml_interface.F90