diff --git a/main.py b/main.py
index 2bed32a3e08932438b23ef61288dff542d15c684..e2d0eb9149acaf9098ed2dd3bbba3089761f2e72 100644
--- a/main.py
+++ b/main.py
@@ -1 +1,5 @@
+<<<<<<< HEAD
 print("This is the new main file") 
+=======
+print("This is main file") 
+>>>>>>> 306f14a67c7704a3d10f56069b5455b959684986