diff --git a/main.py b/main.py
index bd66506..3482e08 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,3 @@
 import os
-<<<<<<< HEAD
 os.system('python Function-20231098.py')
-=======
-os.system('python Function-20231140.py')
->>>>>>> 618b3e93d0b17ea718ae609c45ee2d68522a6e20
+