Fix bad merge conflict resolution