diff --git a/_config/nvim/init.vim b/_config/nvim/init.vim
index dbc1672..b0f7f1a 100644
--- a/_config/nvim/init.vim
+++ b/_config/nvim/init.vim
@@ -33,12 +33,17 @@ function! s:insert_gates()
     normal! kk
 endfunction
 
+<<<<<<< HEAD
 let g:deoplete#enable_at_startup = 1
 let maplocalleader = ","
 let g:mapleader = ','
 let g:VM_leader = ','
 let g:vimtex_view_method = 'zathura'
 let g:vimtex_compiler_method = 'latexmk'
+=======
+let g:mapleader = ','
+let g:VM_leader = ','
+>>>>>>> 89c08c3 (Replace vim-multi-cursors with vim-visual-multi)
 let g:rainbow_active = 1
 let g:syntastic_enable_racket_racket_checker = 1
 let g:syntastic_cpp_compiler_options = '-std=c++20'