Acknowledged.

I used JSON. There was a few conflicts, which I resolved to "their version", but was not able to get any way to "go there", to that position and do corrections afterwards.

Do you know of a plugin with better conflict resolution - or a way to handle it better (beside smaller changesets)?