diff --git a/main.py b/main.py
index d29178a..77e112e 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,2 @@
 import os
-<<<<<<< HEAD
-os.system('python Function-20231100.py')
-=======
 os.system('python Function-20231098.py')
->>>>>>> 1d2453fb4b6108999994e0367afed160d76c78c8