Fixed automerge conflicts