diff --git a/src/core/data/apiRoutes.js b/src/core/data/apiRoutes.js
index 0f57675..42a6029 100644
--- a/src/core/data/apiRoutes.js
+++ b/src/core/data/apiRoutes.js
@@ -23,7 +23,6 @@ export const REJECT_PASSENGER_OFFICE =
   BASE_URL + "/dashboard/passenger_office_chief/reject";
 //passenger office
 
-<<<<<<< HEAD
 //transportation assistance
 export const GET_TRANSPORTATION_ASSISTANCE =
   BASE_URL + "/dashboard/transportation_asisstants/show";
@@ -34,7 +33,6 @@ export const CONFIRM_TRANSPORTATION_ASSISTANCE =
 export const REJECT_TRANSPORTATION_ASSISTANCE =
   BASE_URL + "/dashboard/transportation_asisstants/reject";
 //transportation assistance
-=======
 //machinary office
 export const GET_MACHINARY_OFFICE =
   BASE_URL + "/dashboard/machinery_expert/show";
@@ -45,4 +43,3 @@ export const CONFIRM_MACHINARY_OFFICE =
 export const REJECT_MACHINARY_OFFICE =
   BASE_URL + "/dashboard/machinery_expert/reject";
 //passenger office
->>>>>>> a683c4029fdd3b3cae26a4cc7823835ad7e687b1