diff --git a/docs/swagger/swagger-spec.json b/docs/swagger/swagger-spec.json
index f0c9119..ab24575 100644
--- a/docs/swagger/swagger-spec.json
+++ b/docs/swagger/swagger-spec.json
@@ -3,7 +3,7 @@
   "paths": {
     "/": {
       "get": {
-        "operationId": "ShiftsValidationController_getSummary",
+        "operationId": "ShiftsOverviewController_getSummary",
         "parameters": [],
         "responses": {
           "200": {
@@ -11,7 +11,7 @@
           }
         },
         "tags": [
-          "ShiftsValidation"
+          "ShiftsOverview"
         ]
       }
     },
@@ -545,9 +545,34 @@
         ]
       }
     },
-<<<<<<< HEAD
-    "/auth/v1/login": {
-=======
+    "/timesheets/{id}/approval": {
+      "patch": {
+        "operationId": "TimesheetsController_approve",
+        "parameters": [
+          {
+            "name": "id",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "access-token": []
+          }
+        ],
+        "tags": [
+          "Timesheets"
+        ]
+      }
+    },
     "/Expenses": {
       "post": {
         "operationId": "ExpensesController_create",
@@ -742,6 +767,34 @@
         ]
       }
     },
+    "/Expenses/{id}/approval": {
+      "patch": {
+        "operationId": "ExpensesController_approve",
+        "parameters": [
+          {
+            "name": "id",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "access-token": []
+          }
+        ],
+        "tags": [
+          "Expenses"
+        ]
+      }
+    },
     "/shifts": {
       "post": {
         "operationId": "ShiftsController_create",
@@ -936,9 +989,37 @@
         ]
       }
     },
+    "/shifts/{id}/approval": {
+      "patch": {
+        "operationId": "ShiftsController_approve",
+        "parameters": [
+          {
+            "name": "id",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "access-token": []
+          }
+        ],
+        "tags": [
+          "Shifts"
+        ]
+      }
+    },
     "/export.csv": {
       "get": {
-        "operationId": "ShiftsValidationController_exportCsv",
+        "operationId": "ShiftsOverviewController_exportCsv",
         "parameters": [],
         "responses": {
           "200": {
@@ -946,7 +1027,7 @@
           }
         },
         "tags": [
-          "ShiftsValidation"
+          "ShiftsOverview"
         ]
       }
     },
@@ -1144,8 +1225,35 @@
         ]
       }
     },
-    "/auth/login": {
->>>>>>> b0406b3a4c00223b9430ef29b60a4775beca4328
+    "/leave-requests/{id}/approval": {
+      "patch": {
+        "operationId": "LeaveRequestController_updateApproval",
+        "parameters": [
+          {
+            "name": "id",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "access-token": []
+          }
+        ],
+        "tags": [
+          "Leave Requests"
+        ]
+      }
+    },
+    "/auth/v1/login": {
       "get": {
         "operationId": "AuthController_login",
         "parameters": [],
@@ -1292,6 +1400,29 @@
         ]
       }
     },
+    "/exports/csv": {
+      "get": {
+        "operationId": "CsvExportController_exportCsv",
+        "parameters": [
+          {
+            "name": "period",
+            "required": true,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          }
+        },
+        "tags": [
+          "CsvExport"
+        ]
+      }
+    },
     "/customers": {
       "post": {
         "operationId": "CustomersController_create",
diff --git a/src/modules/expenses/expenses.module.ts b/src/modules/expenses/expenses.module.ts
index fec1a3d..e18e154 100644
--- a/src/modules/expenses/expenses.module.ts
+++ b/src/modules/expenses/expenses.module.ts
@@ -2,11 +2,12 @@ import { ExpensesController } from "./controllers/expenses.controller";
 import { Module } from "@nestjs/common";
 import { ExpensesService } from "./services/expenses.service";
 import { BusinessLogicsModule } from "src/modules/business-logics/business-logics.module";
+import { ExpensesApprovalService } from "./services/expenses-approval.service";
 
 @Module({
     imports: [BusinessLogicsModule],
     controllers: [ExpensesController],
-    providers: [ExpensesService],
+    providers: [ExpensesService, ExpensesApprovalService],
     exports: [ ExpensesService ],
 })
 
diff --git a/src/modules/pay-periods/pay-periods.module.ts b/src/modules/pay-periods/pay-periods.module.ts
index 142c582..3d8ce3a 100644
--- a/src/modules/pay-periods/pay-periods.module.ts
+++ b/src/modules/pay-periods/pay-periods.module.ts
@@ -3,12 +3,14 @@ import { PayPeriodsService } from "./services/pay-periods.service";
 import { PayPeriodsController } from "./controllers/pay-periods.controller";
 import { Module } from "@nestjs/common";
 import { PayPeriodsOverviewService } from "./services/pay-periods-overview.service";
+import { PayPeriodsApprovalService } from "./services/pay-periods-approval.service";
 
 @Module({
     imports: [PrismaModule],
     providers: [
         PayPeriodsService,
         PayPeriodsOverviewService,
+        PayPeriodsApprovalService,
     ],
     controllers: [PayPeriodsController],
 })
diff --git a/src/modules/shifts/shifts.module.ts b/src/modules/shifts/shifts.module.ts
index a2b2101..2f55b80 100644
--- a/src/modules/shifts/shifts.module.ts
+++ b/src/modules/shifts/shifts.module.ts
@@ -4,11 +4,12 @@ import { ShiftsService } from './services/shifts.service';
 import { BusinessLogicsModule } from 'src/modules/business-logics/business-logics.module';
 import { ShiftsOverviewController } from './controllers/shifts-overview.controller';
 import { ShiftsOverviewService } from './services/shifts-overview.service';
+import { ShiftsApprovalService } from './services/shifts-approval.service';
 
 @Module({
   imports: [BusinessLogicsModule],
   controllers: [ShiftsController, ShiftsOverviewController],
-  providers: [ShiftsService, ShiftsOverviewService],
+  providers: [ShiftsService, ShiftsOverviewService, ShiftsApprovalService],
   exports: [ShiftsService, ShiftsOverviewService],
 })
 export class ShiftsModule {}
diff --git a/src/modules/timesheets/timesheets.module.ts b/src/modules/timesheets/timesheets.module.ts
index debf169..6c20537 100644
--- a/src/modules/timesheets/timesheets.module.ts
+++ b/src/modules/timesheets/timesheets.module.ts
@@ -2,11 +2,19 @@ import { Module } from '@nestjs/common';
 import { TimesheetsController } from './controllers/timesheets.controller';
 import { TimesheetsService } from './services/timesheets.service';
 import { BusinessLogicsModule } from 'src/modules/business-logics/business-logics.module';
+import { TimesheetsApprovalService } from './services/timesheets-approval.service';
+import { ShiftsApprovalService } from '../shifts/services/shifts-approval.service';
+import { ExpensesApprovalService } from '../expenses/services/expenses-approval.service';
 
 @Module({
   imports: [BusinessLogicsModule],
   controllers: [TimesheetsController],
-  providers: [ TimesheetsService ],
+  providers: [ 
+            TimesheetsService,
+            TimesheetsApprovalService,
+            ShiftsApprovalService,
+            ExpensesApprovalService
+          ],
   exports: [TimesheetsService],
 })
 export class TimesheetsModule {}