mismerged: typo in conflict resolution (times three)