Correcting erroneous results of merge