Overlapping handling and other stuff?
Merge conflict resolution