GitHub didn't let me merge a pull request