Fix merge conflict resolution