diff --git a/DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs b/DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs
index e97bd90..2ffd8cf 100644
--- a/DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs
@@ -44,12 +44,8 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-<<<<<<< HEAD
 app.UseCors("DamageAppCorsPolicy");
 app.UseAuthorization();
-=======
-
->>>>>>> 9ec9b8b96fc7c5767fcddf1e4e52bde203fcf619
 
 // Enable CORS, authentication, and authorization middleware.
 app.UseCors("DamageAppCorsPolicy");
diff --git a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs
index e7fe14c..aec0623 100644
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs
@@ -44,12 +44,10 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-<<<<<<< HEAD
-=======
 
 
 // Enable CORS, authentication, and authorization middleware.
->>>>>>> 9ec9b8b96fc7c5767fcddf1e4e52bde203fcf619
+
 app.UseCors("DamageAppCorsPolicy");
 app.UseAuthorization();
 
diff --git a/DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs b/DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs
index 7304cfd..1721409 100644
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs
@@ -64,10 +64,6 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
-<<<<<<< HEAD
-=======
-// Enable CORS, authentication, and authorization middleware.
->>>>>>> 9ec9b8b96fc7c5767fcddf1e4e52bde203fcf619
 app.UseCors("DamageAppCorsPolicy");
 app.UseAuthorization();