diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index c510495..30738e7 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -6,11 +6,7 @@ export const environment = {
   production: false,
   apiUrl: 'http://api.vniigazv2.lc',
   clientId: 2,
-<<<<<<< HEAD
-  clientSecret: 'tTuEbUSla2RfgM5ailI0TvHmekaR6YMTDr4aswhW',
-=======
   clientSecret: 'pwyOjmmtHGUUM8KFPjgZrpbbrrJkQ45PkthQ5Xtp',
->>>>>>> 32d2a0ff67cfbf544a1ba47d7afbc7f5dce1bb6a
 };
 
 /*