diff --git a/script.js b/script.js
index d5ac294..c6db3fb 100644
--- a/script.js
+++ b/script.js
@@ -1,2 +1,10 @@
 console.log("Hello world");
+<<<<<<< HEAD
 console.log("Hello world!!!");
+=======
+console.log("Hello world!");
+<<<<<<< HEAD
+console.log("Hello world!!");
+>>>>>>> 861e330 (fix: fixed changes in  js file)
+=======
+>>>>>>> b302a16 (Revert "fix: fixed changes in  js file")