diff --git a/index.php b/index.php
index 4ac413c..36b2c37 100644
--- a/index.php
+++ b/index.php
@@ -70,12 +70,6 @@
             operations_form_ctrl();
             break;
 
-<<<<<<< HEAD
-        case 'add_operation':
-            require('controllers/operation_ctrl.php');
-            add_operation_write_ctrl();
-            break;
-=======
         case 'lecture':
             require('views/lecture_page.php');
             break;
@@ -84,7 +78,6 @@
             require('controllers/lecture_page_ctrl.php');
             break;
 
->>>>>>> c98d36d6ee22b1cc45aaf2d55c29677ea8c56d65
         default:
             require('views/404_view.php');
             break;