Merge branch 'master' of C:\Users\owner\IdeaProjects\BlazeSwing with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
The Jews