Rebase Commits, sorry but it needed to be
Merge remote-tracking branch 'upstream/master'