Who knows what I ended up doing.. eh
Merge remote-tracking branch 'origin/master'