diff --git a/main.py b/main.py
index ef01faa..069aab5 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,2 @@
 import os
-<<<<<<< HEAD
-os.system('python Function-21371258.py')
-=======
-os.system('python Function-21371188.py')
->>>>>>> Student-21371188
+os.system('python Function-21371188.py')
\ No newline at end of file