diff --git a/main.py b/main.py
index 0e6b7b9..77e112e 100644
--- a/main.py
+++ b/main.py
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-=======
 import os
 os.system('python Function-20231098.py')
->>>>>>> student-20231098