diff --git a/main.py b/main.py
index cf12255..b003551 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,2 @@
 import os
-<<<<<<< HEAD
 os.system('python Function-21371112.py')
-=======
-os.system('python Function-21371489.py')
->>>>>>> c2ed1daf4fc61d992ba340efac67c0354369a18b