diff --git a/a.js b/a.js
index b51e4f5..2777dfc 100644
--- a/a.js
+++ b/a.js
@@ -1 +1 @@
-console.log("Git class 17 Jan");
+console.log("Hello from Tanishq solved the problem! merge conflict resolved.");