diff --git a/iconized.sh b/iconized.sh
index 60508a5a..c14e7b3d 100755
--- a/iconized.sh
+++ b/iconized.sh
@@ -1,3 +1,6 @@
+<<<<<<< HEAD
+#!/bin/bash
+=======
 #!/bin/bash
 
 # Author    : Eshan Roy
@@ -29,4 +32,5 @@ main() {
     push_to_github
 }
 
-main
\ No newline at end of file
+main
+>>>>>>> 122db96bc4e6a7242cb3d37c53eef560cb6aba8f