Address the conflict issue
Merge branch 'Integration_Rel18_SA5_151_YAML' into 'TS28.312_Rel18_CR0117_Update_the_stage3_for_intent_report_to_align_with_the_stage2_definition' # Conflicts: # OpenAPI/TS28312_IntentNrm.yaml
Merge branch 'Integration_Rel18_SA5_151_YAML' into 'TS28.312_Rel18_CR0117_Update_the_stage3_for_intent_report_to_align_with_the_stage2_definition' # Conflicts: # OpenAPI/TS28312_IntentNrm.yaml