local change
Merge remote-tracking branch 'upstream/master'
local change
Merge remote-tracking branch 'upstream/master'

removed
Merge remote-tracking branch 'upstream/master'

 updated