Add new plugins and .vim folder
Fix merge conflict