xml messed up in hard merge, possible fix