VIM-92: Fix Vim keymap to work better in Mac OS

- remove all static overrides from vim.xml
- introduce conflicts resolving