diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py
index 40f8219b62593152e23d5824011ec4bbf199c6b1..80ba9e138d329d7232ca2248caec7612a01807b8 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py
@@ -9,14 +9,11 @@ from .responses import internal_server_error, forbidden_error, not_found_error,
 from .auth_manager import AuthManager
 from .redis_event import RedisEvent
 from .publisher import Publisher
-<<<<<<< Updated upstream
 from ..models.service_api_description import ServiceAPIDescription
 import json
 from ..encoder import CustomJSONEncoder
-=======
 from ..vendor_specific import add_vend_spec_fields
 
->>>>>>> Stashed changes
 publisher_ops = Publisher()