git needs to learn how to merge xml.