Fixed erratic previous automatic merge