Three-way merge: fix silly bug that made trivial merges not work