Fix incomplete merge conflict resolution