github desktop view merge conflicts