view merge conflicts github