IntelliJ IDEA: Resolving Merge Conflicts in Git | IntelliJ IDEA, a JetBrains IDE | Podwise