not working but close
here buddy!
Merge remote-tracking branch 'Sam/master'
profile stuff