Automerge that was a bit zealous