git bash handle merge conflicts