diff --git a/hello.py b/hello.py
index 18bc0bb..d27a9fc 100644
--- a/hello.py
+++ b/hello.py
@@ -1,7 +1,7 @@
-<<<<<<< HEAD
+
 print("Hello World!")
 print("Sarvjeet contibuted this code.....")
-=======
+
 # Run the script
 print("Hello World!")
->>>>>>> 84b766aa5d06de2351f85c3898b6629b3835c805
+print("hello world byyyy Ravi Prakash")
\ No newline at end of file