diff --git a/name.py b/name.py
index 0fb70c5..f95cfd3 100644
--- a/name.py
+++ b/name.py
@@ -1,2 +1,6 @@
-name = "Your Name"
+<<<<<<< HEAD
+name = "12345"
+=======
+name = "e"
+>>>>>>> 77d9dc80a728b74d449a436e4e8539cf316570bf
 print("My name is", name)