diff --git a/Marco.Pms.Services/Program.cs b/Marco.Pms.Services/Program.cs
index 318d6fe..a1a7162 100644
--- a/Marco.Pms.Services/Program.cs
+++ b/Marco.Pms.Services/Program.cs
@@ -173,7 +173,7 @@ app.UseStaticFiles(); // Enables serving static files
 
 =======
 //app.UseSerilogRequestLogging(); // Log HTTP requests
->>>>>>> Created new API for creating new tenant
+>>>>>>> a4156153ff6618675abf0590395745816019a973
 app.UseHttpsRedirection();
 app.UseMiddleware<ExceptionHandlingMiddleware>();
 app.UseMiddleware<TenantMiddleware>();
diff --git a/Marco.Pms.Services/appsettings.json b/Marco.Pms.Services/appsettings.json
index b94ddd6..dd7e402 100644
--- a/Marco.Pms.Services/appsettings.json
+++ b/Marco.Pms.Services/appsettings.json
@@ -11,7 +11,7 @@
         "Microsoft": "Warning",
         "Microsoft.EntityFrameworkCore.Database.Command": "Warning",
         "Microsoft.AspNetCore.Mvc.Infrastructure": "Warning",
-        "Serilog.AspNetCore.RequestLoggingMiddleware": "Warning"
+        //"Serilog.AspNetCore.RequestLoggingMiddleware": "Warning"
       }
     },
     "WriteTo": [
@@ -64,8 +64,13 @@
 
     "ConnectionStrings": {
         // "DefaultConnectionString": "Server=103.50.160.45;User ID=marcowvh_admin;Password=Marcoemp@123;Database=marcowvh_empattendanceci",
+<<<<<<< HEAD
+        //"DefaultConnectionString": "Server=localhost;port=3333;User ID=root;Password=root;Database=MarcoBMS1",
+        "DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS1"
+=======
         "DefaultConnectionString": "Server=localhost;port=3333;User ID=root;Password=root;Database=MarcoBMS1",
         //"DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS1"
+>>>>>>> a4156153ff6618675abf0590395745816019a973
     },
   "AppSettings": {
     "WebFrontendUrl": "http://localhost:5173",