diff --git a/src/CMSMicroservice.WebApi/appsettings.json b/src/CMSMicroservice.WebApi/appsettings.json
index 7f2542a..74548da 100644
--- a/src/CMSMicroservice.WebApi/appsettings.json
+++ b/src/CMSMicroservice.WebApi/appsettings.json
@@ -2,10 +2,7 @@
   "PaymentProvider": "zarinpal",
   "ZarinPal": {
     "MerchantId": "4225d555-5fa9-4df0-9b61-1ce152cbbba8",
-<<<<<<< HEAD
     "UseSandbox": false
-=======
-    "UseSandbox": true
   },
   "TwentyCard": {
     "BaseUrl": "https://gateway.20card.ir/ipg",
@@ -25,12 +22,6 @@
       }
     }
   },
-  "CmsBaseUrl": "https://localhost:32846",
-  "FrontOfficeBaseUrl": "http://localhost:5268",
-  "FMS": {
-    "Address": "https://dl.afrino.co"
->>>>>>> kub-stage
-  },
   "CmsBaseUrl": "https://cms.kbs2.ir",
   "FrontOfficeBaseUrl": "https://kbs2.ir",
   "JwtSecurityKey": "TvlZVx5TJaHs8e9HgUdGzhGP2CIidoI444nAj+8+g7c=",