handle merge conflicts