- [Resolve simple merge conflicts on GitHub](https://github.blog/2016-12-12-resolve-simple-merge-conflicts-on-github/) - [Git & GitHub: Merge Conflicts / YouTube [1m38s]](https://www.youtube.com/watch?v=sfT0WrChMrM)