diff --git a/main.py b/main.py
index f28c86c..5d78362 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,2 @@
 import os
-<<<<<<< HEAD
 os.system('python Function-21373067.py')
-=======
-os.system('python Function-21371101.py')     
->>>>>>> Student-21371101