Apparently I made a change I didn't push
Merge remote-tracking branch 'origin/master'