fixed some automerge problems