Fix wrong merge conflict resolution