diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index eb1b76a..e9a61af 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -31,7 +31,11 @@ Plug 'neoclide/coc-yaml', {'do': 'yarn install --frozen-lockfile'}
 Plug 'neoclide/coc-json', {'do': 'yarn install --frozen-lockfile'}
 Plug 'fannheyward/coc-markdownlint', {'do': 'yarn install --frozen-lockfile; npm i -D markdownlint --save-dev'}
 Plug 'josa42/coc-sh', {'do': 'yarn install --frozen-lockfile; npm i -D bash-language-server'}
+<<<<<<< HEAD
 Plug 'neoclide/coc-prettier', {'do': 'yarn install --frozen-lockfile'}
+=======
+Plug 'prettier/vim-prettier', { 'do': 'yarn install; npm i -D prettier; npm i -D prettier-plugin-sh' }
+>>>>>>> 69c5868c40159e79a4f438f446687f7445a3e160
 Plug 'dracula/vim', { 'as': 'dracula'}
 Plug 'jnurmine/Zenburn', { 'as': 'zenburn'}
 Plug 'junegunn/fzf.vim'