Merge conflicts on GitHub website

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).

![](https://4.bp.blogspot.com/-hFeQOcGkxNM/WFCaOI3pDKI/AAAAAAAAhBg/s5ZA2JgUDF4J5NQn8cXDCgaklegz8RstwCK4B/s1600/fd64b010-c06b-11e6-9dd3-a827e299c5bf.gif)