Resolved Conflicts.

src/main/resources/message_en.properties

@@ -314,6 +314,8 @@ company.id.required.for.preferred.call=Company ID is required when requesting on
 response.days.not.null=Response days should not be null and greater than zero.
 application.cannot.approved.or.rejected=Application cannot be approved and rejected because amendment is active.
 
+atleast.one.id.required=At least one of companyId or applicationId must be provided
+
 #Appointment flow messages
 ndg.generated = NDG Generated.
 ndg.available = NDG Available.