diff --git a/main.py b/main.py
index f3c55b6..8393f09 100644
--- a/main.py
+++ b/main.py
@@ -1,8 +1,3 @@
 import os
-<<<<<<< HEAD
-os.system('python Function-21371192.py')
-os.system('echo Feature-21371192')
-=======
 os.system('python Function-21371434.py')
 os.system('echo Feature-21371434')
->>>>>>> dev