There's no way this will work but i'll commit it anyway
Merge remote-tracking branch 'origin/master'