diff --git a/0x01-git/bash/alx b/0x01-git/bash/alx
index fb9a186..804eb7a 100644
--- a/0x01-git/bash/alx
+++ b/0x01-git/bash/alx
@@ -1,6 +1,4 @@
 #!/bin/bash
-<<<<<<< HEAD
 echo "ALX School is so cool!"
-=======
-echo "ALX School is so cool!"
->>>>>>> master
+
+