diff --git a/src/__test__/testSetup.ts b/src/__test__/testSetup.ts
index 7bc05902..54663f08 100644
--- a/src/__test__/testSetup.ts
+++ b/src/__test__/testSetup.ts
@@ -1,10 +1,13 @@
 import { DbConnection } from '../database/index';
 import UserModel from '../database/models/userModel';
 import { Role } from '../database/models';
+<<<<<<< HEAD
 import Category from '../database/models/categoryEntity';
 import Product from '../database/models/productEntity';
 import request from 'supertest';
 import app from '../app';
+=======
+>>>>>>> 4979604 (* feat(rbac): Implement role based access control)
 
 export async function beforeAllHook() {
   await DbConnection.instance.initializeDb();
@@ -12,6 +15,7 @@ export async function beforeAllHook() {
   // Get repositories
   const userRepository = await DbConnection.connection.getRepository(UserModel);
   const roleRepository = await DbConnection.connection.getRepository(Role);
+<<<<<<< HEAD
   const categoryRepository =
     await DbConnection.connection.getRepository(Category);
   const productRepository =
@@ -23,6 +27,12 @@ export async function beforeAllHook() {
     await categoryRepository.createQueryBuilder().delete().execute();
     await userRepository.createQueryBuilder().delete().execute();
     await roleRepository.createQueryBuilder().delete().execute();
+=======
+
+  // Delete all users and roles
+  await userRepository.createQueryBuilder().delete().execute();
+  await roleRepository.createQueryBuilder().delete().execute();
+>>>>>>> 4979604 (* feat(rbac): Implement role based access control)
 }
 export async function getAdminToken() {
   const userRepository = await DbConnection.connection.getRepository(UserModel);
diff --git a/src/app.ts b/src/app.ts
index ef2047b3..f9544050 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -4,14 +4,23 @@ import morgan from 'morgan';
 import swaggerUi from 'swagger-ui-express';
 import swaggerSpec from './docs/swaggerconfig';
 import 'reflect-metadata';
+<<<<<<< HEAD
 import router from './routes/index';
+=======
+import userRoute from './routes/userRoutes';
+import roleRoutes from './routes/roleRoutes';
+>>>>>>> 4979604 (* feat(rbac): Implement role based access control)
 
 import fs from 'fs';
 import path from 'path';
 import authRoutes from './routes/auth-routes';
 import cookieSession from 'cookie-session';
 import passport from 'passport';
+<<<<<<< HEAD
 import userRouter from './routes/userRoutes';
+=======
+
+>>>>>>> 4979604 (* feat(rbac): Implement role based access control)
 // Require Passport midleware
 require('./middlewares/passport-setup');
 
@@ -24,7 +33,13 @@ const logStream = fs.createWriteStream(path.join(__dirname, 'output.log'), {
   flags: 'a',
 });
 
+<<<<<<< HEAD
 //Data Sanitation Against SQL injection
+=======
+//Data Sanitation Against SQL injection 
+
+//Data Sanitation Against SiteScripts
+>>>>>>> 4979604 (* feat(rbac): Implement role based access control)
 
 morgan.token('type', function (req: Request) {
   return req.headers['content-type'];
diff --git a/src/database/models/userModel.ts b/src/database/models/userModel.ts
index e30a4a9f..e7581857 100644
--- a/src/database/models/userModel.ts
+++ b/src/database/models/userModel.ts
@@ -36,8 +36,11 @@ export default class UserModel {
   @Column({ default: false })
   isVerified: boolean;
 
+<<<<<<< HEAD
   @Column({ default: 'active' })
   status: 'active' | 'inactive';
+=======
+>>>>>>> 4979604 (* feat(rbac): Implement role based access control)
 
   @Column({ nullable: true }) 
   twoFactorCode: number;
diff --git a/src/docs/userAuth.ts b/src/docs/userAuth.ts
index 826f43d0..e59987bd 100644
--- a/src/docs/userAuth.ts
+++ b/src/docs/userAuth.ts
@@ -1,10 +1,7 @@
 /**
  * @swagger
-<<<<<<< HEAD
  * /api/v1/user/login:
-=======
  * /api/v1/login:
->>>>>>> 4979604 (* feat(rbac): Implement role based access control)
  *   post:
  *     summary: Login user
  *     tags: [Login]
@@ -95,3 +92,4 @@
  *                   type: string
  *                   description: An error message indicating internal server error
  */
+