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