fixing automerge problem