One more automerge issue