Fix merge

.vimrc

@@ -38,13 +38,10 @@ else
     Plug 'spf13/vim-colors'
     " PaperColor theme
     Plug 'NLKNguyen/papercolor-theme'
-<<<<<<< HEAD
     " vim-sol theme for diffs
     Plug 'kshenoy/vim-sol'
-=======
     " Add support for json with comments
     Plug 'kevinoid/vim-jsonc'
->>>>>>> eb6b21a6a5e3a4eb219b34217abc56a66bdf4e3f
 endif
 
 " Ack, similar like grep