diff --git a/tf-modules/azure/devops/outputs.tf b/tf-modules/azure/devops/outputs.tf
index 0d7a830..6801fcd 100644
--- a/tf-modules/azure/devops/outputs.tf
+++ b/tf-modules/azure/devops/outputs.tf
@@ -1,6 +1,4 @@
 output "repo_url" {
-<<<<<<< HEAD
-<<<<<<< HEAD
   description = "Azure Devops Git repository HTTPS url"
   value       = azuredevops_git_repository.application.remote_url
 }
@@ -9,23 +7,3 @@ output "project_id" {
   description = "Azure Devops Project ID"
   value       = azuredevops_project.project.id
 }
-=======
-    description = "Azure Devops Git repository HTTPS url"
-    value = azuredevops_git_repository.application.remote_url
-}
-
-output "project_id" {
-    description = "Azure Devops Project ID"
-    value = azuredevops_project.project.id  
-}
->>>>>>> 5d9335c (Add project_id to devops TF output)
-=======
-  description = "Azure Devops Git repository HTTPS url"
-  value       = azuredevops_git_repository.application.remote_url
-}
-
-output "project_id" {
-  description = "Azure Devops Project ID"
-  value       = azuredevops_project.project.id
-}
->>>>>>> 365b59d (Format the terraform files, use latest versions and remove tags)