Apparently I don't know how to use Git. Tried to merge some stuff.
Merge remote-tracking branch 'origin/master'