diff --git a/hello.py b/hello.py
index 547763aceeb13dfa464c9854eed46bedcfaa92a9..387e56ac85d516f20782a2ec63bac16103e2a340 100644
--- a/hello.py
+++ b/hello.py
@@ -1,4 +1,2 @@
-<<<<<<< hello.py
-print('hey there guys, its jeff, im scared of you')
 
->>>>>>> hello.py
+print('hey there guys, its jeff, im scared of you')