Correction of faulty merge