Conflicts using diff JRE
Changed to IDE JRE
Remove untracking files
Fixed merge conflicts