diff --git a/Program.cs b/Program.cs
index ca5b51a..e0644ba 100644
--- a/Program.cs
+++ b/Program.cs
@@ -6,26 +6,18 @@ builder.Services.AddControllers();
 
 builder.Services.AddEndpointsApiExplorer();
 
-<<<<<<< HEAD
-=======
 
->>>>>>> 0efca3b0b5781ab54d78c97a62b20b0f47d7dabf
 builder.Services.AddCors(setup =>
 {
     setup.AddDefaultPolicy(policyBuilder =>
     {
-<<<<<<< HEAD
+
         policyBuilder.WithOrigins("http://www.vdk2ch.ru:4200").WithMethods("PUT", "POST").WithHeaders("*");
     });
 
 });
-=======
-        policyBuilder.WithOrigins("http://www.vdk2ch.ru:4200");
-    });
 
-});
 //builder.Services.AddSwaggerGen();
->>>>>>> 0efca3b0b5781ab54d78c97a62b20b0f47d7dabf
 
 var app = builder.Build();