dunno
ok jj Merge remote-tracking branch 'origin/new_master' into new_master

ZZ
:w
`
:aMerge remote-tracking branch 'origin/new_master' into new_master
jMerge remote-tracking branch 'origin/new_master' into new_master