We really need to fix this whole history thing. Its such a PITA. Just need to settle on some bigger picture decisions around how the whole org wants to deal with this. That said, thanks for resolving the conflicts but if you didn't want to do that just to have them re-appear once I merge things you can just leave them. I can fix them up myself as I merge more easily than you can trying to do it each time I merge one.