Fixed another automerge problem.