diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc
index b66b534..edbacb8 100644
--- a/dotfiles/.vimrc
+++ b/dotfiles/.vimrc
@@ -21,15 +21,10 @@ Plug 'airblade/vim-gitgutter'
 " Java autocomplete
 Plug 'artur-shaik/vim-javacomplete2'
 
-" Generates a lift of todo comments
+" Generates a list of todo comments
 Plug 'chauncey-garrett/vim-tasklist'
-<<<<<<< HEAD
-Plug 'Yggdroot/indentLine'
-Plug 'preservim/nerdcommenter'
-=======
 
 " Fuzzy file finder
->>>>>>> vundle-to-vimplug
 Plug 'ctrlpvim/ctrlp.vim'
 
 " I need thsi for python
@@ -89,18 +84,14 @@ Plug 'tpope/vim-surround'
 " Status line for the bottom of the screen (and a themes pack)
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
-<<<<<<< HEAD
-" Plug 'Yilin-Yang/vim-markbar' "Does not work that good, seems too buggy atm
-=======
 
 " Shows vertical lines to make indents more visible
 Plug 'Yggdroot/indentLine'
->>>>>>> vundle-to-vimplug
+
 
 call plug#end()
 
 
-
 " Leader
 let mapleader = ","
 
@@ -177,22 +168,11 @@ set nojoinspaces
 " Make it obvious where 80 characters is (Python only)
 autocmd FileType python setlocal colorcolumn=81
 
-<<<<<<< HEAD
-"  if !exists(":Ag")
-"    command -nargs=+ -complete=file -bar Ag silent! grep! <args>|cwindow|redraw!
-"    nnoremap \ :Ag<SPACE>
-"  endif
-"endif
-
-" Make it obvious where 80 characters is
-" autocmd FileType python setlocal textwidth=80 colorcolumn=+1
-=======
 " Highlight "self." in different color in python files:
 augroup python_syntax_extra
   autocmd!
   autocmd! Syntax python :syn keyword Keyword self
 augroup END
->>>>>>> vundle-to-vimplug
 
 " Line numbers with the width of 5 digits
 set number
@@ -241,15 +221,10 @@ set ignorecase
 set smartcase
 set hlsearch
 
-<<<<<<< HEAD
-" Search replace bind:
-
-=======
 " Stop highlighting search results.
 nnoremap <leader><space> :nohlsearch<CR>
 
 " Search replace bind:
->>>>>>> vundle-to-vimplug
 nnoremap S :%s//g<Left><Left>
 
 " Strip trailing whitespaces on each save
@@ -310,18 +285,7 @@ let g:ale_fixers = {'python': ['isort', 'black'],
                    \'tex': ['latexindent']}
 
 
-<<<<<<< HEAD
-" Install the linter and fixer for a specific language automatically
-
-"todo Find better solution to do this
-" command InstallLinterFixPython python3 import pip; [pip.main(["install", singlepackage, "--user"]) for singlepackage in "flake8 pylint mypy prospector black isort".split(" ")]
-
-
-" colorscheme toggle:
-
-=======
 " colorscheme toggle dark/light:
->>>>>>> vundle-to-vimplug
 function! s:SwitchColorscheme()
     if g:colors_name == 'darcula'
         set background=light
@@ -365,10 +329,6 @@ set autoread
 "    helptags ~/.vim/doc
 "endif
 
-<<<<<<< HEAD
-
-=======
->>>>>>> vundle-to-vimplug
 " Use persistent history. (so undo from older sessions can be used)
 if !isdirectory("$HOME/.vim/.vim-undo-dir")
     silent !mkdir -p $HOME/.vim/.vim-undo-dir
@@ -378,8 +338,6 @@ set undofile
 
 " Set the character which is used as tab indent marker
 let g:indentLine_char = '┊'
-<<<<<<< HEAD
-=======
 
 " Load local config if there is one
 if filereadable($HOME . "/.vimrc.local")
@@ -387,4 +345,3 @@ if filereadable($HOME . "/.vimrc.local")
 endif
 
 
->>>>>>> vundle-to-vimplug