diff --git a/main.py b/main.py
index e232c4b..752d2b8 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,2 @@
 import os
-<<<<<<< HEAD
-os.system('python Function-21371427.py')
-=======
 os.system('python Function-21371434.py')
->>>>>>> eb19cf0a280dd1bfae38bbea315c6af03ada4c75