Correcting merge conflicts