Fixed merge issues

bash/.bashrc

@@ -24,7 +24,6 @@ export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
 
-<<<<<<< HEAD
 #vi readline
 set -o vi
 #ctrl-x, ctrl-e to launch $EDITOR (vim)
@@ -32,5 +31,3 @@ bind -m vi-insert '"\C-x\C-e": edit-and-execute-command'
 
 #fix clear screen in vi mode
 bind -m vi-insert "\C-l":clear-screen
-=======
->>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf