Over-zealous merging issues