fix bad merge conflict resolution