First three buttons should work okay.
Merge remote-tracking branch 'origin/master'
Basically done