GitHub repository: xmarklar/git-conflict
Primary language: Java
Description: A plugin for JetBrains IDE aim to highlight git conflict contents and make it easier to fix the conflicts.