Continuing with [github's guide to resolving merge conflicts.][1]
This guide will go through resolving merge conflicts that spans to multiple files and more than one people has made a change on the conflicted files. Usually this conflicts occurs when a feature/release branch has made changes to common files or modules that was also been changed on the dev branch.