fixing up bad automerge