Resolve vim conflict keymaps