I have to commit this I guess?
Oh pulling...
Strange bug...
Merge remote-tracking branch 'origin/master'