diff --git a/bash/.bashrc b/bash/.bashrc
index fd47f1f..6485569 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -31,7 +31,11 @@ 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() {
@@ -165,3 +169,5 @@ ex() {
     done
     return "$e"
 }
+
+# turn off incredibly annoying bell