Manual merge conflict resolution