Automerge fix