Sounds like a merge-conflict nightmare