diff --git a/vimrc b/vimrc
index 05a1186..e941bd9 100644
--- a/vimrc
+++ b/vimrc
@@ -32,11 +32,6 @@ endif
 Plugin 'tpope/vim-fugitive'
 " Color schemes
 Plugin 'morhetz/gruvbox'
-<<<<<<< HEAD
-=======
-" Code completion using <tab>
-Plugin 'ervandew/supertab'
->>>>>>> c7499ab8bd1242702abaee5b9301a6b6e30886f8
 
 call vundle#end()
 filetype plugin indent on
@@ -71,11 +66,7 @@ set list listchars=tab:▷⋅,trail:⋅,nbsp:⋅
 " set nowrap
 set hlsearch
 set incsearch
-<<<<<<< HEAD
 set foldlevel=2
-=======
-set foldlevel=3
->>>>>>> c7499ab8bd1242702abaee5b9301a6b6e30886f8
 set colorcolumn=80
 
 " Behaviour