[vim keymap] Add macro support for normal mode
[vim keymap] Remove duplicated @ logic
[vim keymap] Remove q swapping
[vim keymap] Recovery mis-deleted line from 3-way merge conflict