Add vim-unimpaired plugin
fix merge conflicts