diff --git a/src/routes/PublicUserRoutes.js b/src/routes/PublicUserRoutes.js
index 9cc82a4..65d5937 100644
--- a/src/routes/PublicUserRoutes.js
+++ b/src/routes/PublicUserRoutes.js
@@ -25,11 +25,8 @@ const PaymentDetails_Public = Loadable(lazy(() => import('pages/Payment/Details_
 const DemandNote_Public = Loadable(lazy(() => import('pages/DemandNote/Search_Public')));
 const UserMaintainPage_Individual = Loadable(lazy(() => import('pages/User/DetailsPage_Individual')));
 const UserMaintainPage_Organization = Loadable(lazy(() => import('pages/User/DetailsPage_Organization')));
-<<<<<<< HEAD
 const OrganizationDetailPage = Loadable(lazy(() => import('pages/Organization/DetailPage')));
-=======
 const Msg_Details = Loadable(lazy(() => import('pages/Message/Details')));
->>>>>>> d1c9a54 (message details)
 
 // ==============================|| MAIN ROUTING ||============================== //