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