How to resolve git conflict or git merge issue using Intellij HD

Git conflict is a common scenario arises when multiple people changes the same file. This video is how to overcome such scenarios and fix merge issue using Intellij Resolve git using VS code...