diff --git a/main.py b/main.py
index f530ab8..3f97399 100644
--- a/main.py
+++ b/main.py
@@ -1,13 +1,7 @@
 import os
-<<<<<<< HEAD
 os.system('python Function-21371345.py')
-
-
-
-~
-
-
-=======
 os.system('python Function-21373439.py')
 os.system('echo Feature-21373439')
->>>>>>> dev
+os.system('python Function-21373439.py')
+os.system('echo Feature-21373439')
+