github merge conflicts