Intellij you have failed me.....
Merge remote-tracking branch 'origin/master'