delete
Merge remote-tracking branch 'upstream/master'
add
i
Merge remote-tracking branch 'upstream/master'