diff --git a/vim/.vimrc b/vim/.vimrc
index e585e01..81ae925 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -59,7 +59,6 @@ nnoremap <C-k> <C-W><C-K>
 nnoremap <C-l> <C-W><C-L>
 nnoremap <C-h> <C-W><C-H>
 
-<<<<<<< HEAD
 " provide movements in Insert mode via the <Alt> modifier key
 inoremap <Esc>h <C-o>h
 inoremap <Esc>j <C-o>j
@@ -71,14 +70,12 @@ inoremap <Esc>x <C-o>x
 
 " fix alt meta mappings in rxvt
 "inoremap <A-h> <ESC>a
-=======
 " H/L for beginning/end
 noremap H ^
 noremap L $
 noremap ^ H
 noremap $ L
 
->>>>>>> 416cffd7d3c524d9cd24b9ec0186fa0e169d700a
 " map ctrl-p to fzf 
 nnoremap <C-p> :Files<CR>