diff --git a/worker.js b/worker.js
index 4a4d1a5..9e08e8c 100644
--- a/worker.js
+++ b/worker.js
@@ -2,11 +2,8 @@
 const corsHeaders = {
   'Access-Control-Allow-Origin': '*',
   'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS',
-<<<<<<< Updated upstream
   'Access-Control-Allow-Headers': 'Content-Type, Authorization, Accept',
-=======
   'Access-Control-Allow-Headers': 'Content-Type, Authorization, Accept, Cache-Control, X-Requested-With',
->>>>>>> Stashed changes
   'Access-Control-Max-Age': '86400'
 };