Redo the automatic merge?
There is no Help for this topic.