Correcting merge errors