Fix automerge