Correcting merge problems