diff --git a/bash/.bashrc b/bash/.bashrc
index 6485569..845b91f 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -31,11 +31,8 @@ alias ip='ip -c'
 alias s='sudo'
 alias df='sudo df -hT -x tmpfs -x devtmpfs'
 
-<<<<<<< HEAD
 bind 'set completion-ignore-case on'
-=======
 set bell-style none
->>>>>>> 3d623955297969837dad68344ea49fc073d400bc
 
 ## function and alias for short find
 short_find() {