diff --git a/src/config/env.ts b/src/config/env.ts
index 96a24f7..a447714 100644
--- a/src/config/env.ts
+++ b/src/config/env.ts
@@ -1,9 +1,9 @@
 import "dotenv/config";
 
 export const ENV = {
-<<<<<<< HEAD
   SERVER_URL: process.env.SERVER_URL,
   SERVER_PORT: process.env.SERVER_PORT || 5000,
+  CANVAS_SERVER_URL_DEV: process.env.CANVAS_SERVER_URL_DEV,
   DATABASE_URL: process.env.DATABASE_URL,
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
@@ -12,20 +12,6 @@ export const ENV = {
   CLERK_SECRET_KEY: process.env.CLERK_SECRET_KEY,
   JWT_ACCESS_TOKEN_SECRET: process.env.JWT_ACCESS_TOKEN_SECRET,
   JWT_REFRESH_TOKEN_SECRET: process.env.JWT_REFRESH_TOKEN_SECRET,
+  PEXELS_URL: process.env.PEXELS_URL,
+  PEXELS_ACCESS_KEY: process.env.PEXELS_ACCESS_KEY,
 };
-=======
-    SERVER_URL: process.env.SERVER_URL,
-    SERVER_PORT: process.env.SERVER_PORT || 5000,
-    CANVAS_SERVER_URL_DEV: process.env.CANVAS_SERVER_URL_DEV,
-    DATABASE_URL: process.env.DATABASE_URL,
-    MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
-    MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
-    MINIO_ENDPOINT: process.env.MINIO_ENDPOINT,
-    MINIO_PORT: process.env.MINIO_PORT,
-    CLERK_SECRET_KEY: process.env.CLERK_SECRET_KEY,
-    JWT_ACCESS_TOKEN_SECRET: process.env.JWT_ACCESS_TOKEN_SECRET,
-    JWT_REFRESH_TOKEN_SECRET: process.env.JWT_REFRESH_TOKEN_SECRET,
-    PEXELS_URL: process.env.PEXELS_URL,
-    PEXELS_ACCESS_KEY: process.env.PEXELS_ACCESS_KEY,
-}
->>>>>>> canvas_updated_be