diff --git a/vimrc b/vimrc
index adfd3d6..0e25fe0 100644
--- a/vimrc
+++ b/vimrc
@@ -33,6 +33,7 @@ Plug 'scrooloose/syntastic'
 Plug 'pmsorhaindo/syntastic-local-eslint.vim'
 
 Plug 'tpope/vim-fugitive'
+Plug 'rhysd/conflict-marker.vim'
 Plug 'airblade/vim-gitgutter'
 Plug 'inside/vim-search-pulse'