Advance apologies for asking such a newbie question, but I recently accepted a pull request from another developer on Github before doing a merge, and now I\'m trying to merge t