git bash view merge conflicts