diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php
index f2032ecb..44c4e2a1 100755
--- a/Apollo/api/application/config/routes.php
+++ b/Apollo/api/application/config/routes.php
@@ -371,11 +371,7 @@ $route['getForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/get
 $route['addForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addForFormIdDraftDetails';
 $route['draftMovetoList'] = 'Receive_Enrolment_Fees_Univ_Controller/draftMovetoList';
 $route['editDraftFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/editDraftFormIdFeesDetails';
-<<<<<<< HEAD
 $route['getStudentUnivFormIdFeeDatailsList'] = 'Receive_Enrolment_Fees_Univ_Controller/getStudentUnivFormIdFeeDatailsList';
 $route['getFormIdDetailsStatusUpdateList'] = 'Receive_Enrolment_Fees_Univ_Controller/getFormIdDetailsStatusUpdateList';
 $route['insertStatusUpdateDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/insertStatusUpdateDetails';
-=======
 $route['paymentVerficationDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/paymentVerficationDetails';
-
->>>>>>> 06530705d67f7b2031936171f856ae73f35dafbb