Correcting merge