fixed automerge