Fixed automerge issues