You can now resolve simple merge conflicts on GitHub right from your pull requests, saving you a trip to the command line and helping your team merge pull requests faster. - [Github Blog](https://github.com/blog/2293-resolve-simple-merge-conflicts-on-github). 