diff --git a/backend/combined.log b/backend/combined.log
index 3f1d3f2d..647e8fe5 100644
--- a/backend/combined.log
+++ b/backend/combined.log
@@ -12,18 +12,14 @@
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-04-06 13:20:40"}
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-04 20:37:04"}
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-04 20:39:03"}
-<<<<<<< HEAD
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 20:55:55"}
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 20:55:55"}
-=======
-<<<<<<< Updated upstream
-=======
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 20:55:55"}
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 20:55:55"}
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 21:36:16"}
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 21:36:21"}
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 21:36:22"}
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 21:36:23"}
->>>>>>> Stashed changes
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 21:42:05"}
->>>>>>> 0f7401a (Update deployment YAML files for staging environment)
+{"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 20:55:55"}
+{"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 20:55:55"}
diff --git a/backend/error.log b/backend/error.log
index 3f1d3f2d..d0129e39 100644
--- a/backend/error.log
+++ b/backend/error.log
@@ -12,18 +12,9 @@
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-04-06 13:20:40"}
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-04 20:37:04"}
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-04 20:39:03"}
-<<<<<<< HEAD
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 20:55:55"}
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 20:55:55"}
-=======
-<<<<<<< Updated upstream
-=======
+{"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 21:42:05"}
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 20:55:55"}
 {"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 20:55:55"}
-{"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 21:36:16"}
-{"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 21:36:21"}
-{"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 21:36:22"}
-{"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 21:36:23"}
->>>>>>> Stashed changes
-{"level":"error","message":"No token, authorization denied","timestamp":"2024-05-07 21:42:05"}
->>>>>>> 0f7401a (Update deployment YAML files for staging environment)
+