Fixed automerge error