diff --git a/app/routes/routes.js b/app/routes/routes.js
index d520254..3544885 100644
--- a/app/routes/routes.js
+++ b/app/routes/routes.js
@@ -4,10 +4,7 @@ module.exports = app => {
     const master = require("../controllers/master.controller.js");
     var router = require("express").Router();
   
-<<<<<<< HEAD
-  
-    // Retrieve all Entites
-=======
+
   /**
  * @openapi
  * /api/EntitiesList:
@@ -18,7 +15,7 @@ module.exports = app => {
  *         description: Returns a mysterious string.
  */
     // Retrieve all Tutorials
->>>>>>> 6d54380f49bd9aa3c3e623eccdd3eb6bb98da170
+
     router.get("/EntitiesList", financials.findAllEntities);
     // get statment master data
     router.get("/FinantialsSummary/:id/", financials.FinantialsSummary);