Correcting merge conflicts?