Testing git merges with xml gis data