diff --git a/app/controllers/test.controller.js b/app/controllers/test.controller.js
index 57e17fa..942d62b 100644
--- a/app/controllers/test.controller.js
+++ b/app/controllers/test.controller.js
@@ -169,7 +169,7 @@ Pro42Data.forEach((Pro42Datavalue, key)=>{
 
 
 
-<<<<<<< HEAD
+
 // exports.printAll = () => {
   
 //   .then(() => {
@@ -392,7 +392,6 @@ exports.test =  (req, res) => {
   
 
 
-=======
 exports.testwo = async (req, res) => { 
    console.log( "testtwo")
      req_obj ={"losid":"TEST123"} 
@@ -407,6 +406,6 @@ function testhree(req , res) {
   console.log( req.losid)
   res.send({'status':200,'message':"success"}); 
 } 
->>>>>>> face92357d074e92248fc160a42396b716d3f7b5
+
 
 
diff --git a/app/routes/routes.js b/app/routes/routes.js
index a8ababc..911ea07 100644
--- a/app/routes/routes.js
+++ b/app/routes/routes.js
@@ -8,8 +8,8 @@ module.exports = app => {
   var router = require("express").Router();
 
 
-  
-  router.get("/ConsolidatedSummary", financials.ConsolidatedSummary);
+ 
+
 /**
 * @swagger
 * /api/FinantialsSummary:
@@ -180,10 +180,6 @@ module.exports = app => {
 *     type: integer 
 *     description: statement type
 *     example: 2
-*    additional_year_type:
-*     type: integer 
-*     description: additional year type(1=Quarterly , 2=Halfyearly , 3=Full)
-*     example: 3
 */
 /**
 * @swagger
@@ -818,6 +814,7 @@ module.exports = app => {
 *     description: success
 */
    router.get("/Historyapi", master.Historyapi);
+   
   // router.get("/printAll", test.printAll);
    router.get("/test", test.test);
    router.get("/test1", test.test1);