Merging two conflicting versions of the same map. It's a bit of a mess, but it is very doable as long as the changes in one of them is localised to a single area.