Solutions contents have differences only in line separators

Use jetbrains Home products , This will happen sometime

  In comparison git Document differences , There will be differences due to different delimiters

resolvent

stay IDEA Conflict file found in , Double click with shortcut keys  shirt , Then enter  line separators

 

  Then choose the corresponding CRLF take Separator Setting what you need can solve this problem .