Resolving Git Merge Conflicts in IntelliJ IDEA

https://wordpress.foojay.io/today/resolving-git-merge-conflicts-in-intellij-idea/