Fix automerge issue