Fixed some merge conflict leftovers in .xml files