diff --git a/http/swagger.yml b/http/swagger.yml
index 283919ec19..3461bd2240 100644
--- a/http/swagger.yml
+++ b/http/swagger.yml
@@ -6556,12 +6556,9 @@ components:
             org:
               type: string
               format: uri
-<<<<<<< HEAD
-=======
             labels:
               type: string
               format: uri
->>>>>>> feat(http): add labels to variables
         id:
           readOnly: true
           type: string