diff --git a/edge_cloud_management_api/specification/openapi.yaml b/edge_cloud_management_api/specification/openapi.yaml
index ab8567e9af9d0cce78834e6cc91866fd6d5d0f70..000c0be3d6bf8dd80472a0e8b419e9c04b567eda 100644
--- a/edge_cloud_management_api/specification/openapi.yaml
+++ b/edge_cloud_management_api/specification/openapi.yaml
@@ -824,12 +824,8 @@ paths:
         "405":
           description: Method not allowed
         "404":
-<<<<<<< HEAD
-          description: Session not found
-=======
           description: Session not found  
   
->>>>>>> 1c306f8dd595452cbe7804c3473f2f4b77a0b270
   /partner:
     post: 
       tags: