Fix merge conflict resolution mess