put everything into one big file, I know this is bad ...
Merge remote branch 'origin/master'
I know this is bad :(