Video: Resolve GitHub Merge Conflicts

Step by step guide to resolve GitHub merge conflicts using command line and merge editors for fast safe integration