Added step number 7 ;)
Merge remote-tracking branch 'origin/master'