IDEA-23416 (IDEA>Settings>Editor>Colors&Fonts>File Status> "Merged with conflicts...