fixing the automerge mess.