diff --git a/config/cors.php b/config/cors.php
index 8287cbf..19f2551 100644
--- a/config/cors.php
+++ b/config/cors.php
@@ -20,13 +20,9 @@ return [
 
     'allowed_methods' => ['*'],
 
-<<<<<<< HEAD
     'allowed_origins' => env('DEV', 0) == 1
         ? explode(',', env('DEV_CORS_ALLOWED_ORIGINS'))
         : explode(',', env('PROD_CORS_ALLOWED_ORIGINS')),
-=======
-    'allowed_origins' => ['*'],
->>>>>>> dev
 
     'allowed_origins_patterns' => [],