correcting merge problems