Merge remote branch 'upstream/master'
whatever fill was doing
Merge remote-tracking branch 'upstream/master'

what?
removed a test file