feat: merge conflict #9921

Job	Run time
setup-matrix	7s
install	25s
lint	1m 3s
unit-tests	36s
flow	53s
build	1m 56s
instance-version	2s
cypress-dev (1, cypress/e2e/AllAccessibleRecordsPage/AllAccessibleRecordsPage.feature, cypress/e2...	7m 7s
cypress-dev (2, cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageForm/EnrollmentAddEventP...	9m 12s
cypress-dev (3, cypress/e2e/EnrollmentAddEventPage/EnrollmentAddEventPageNavigation/EnrollmentAdd...	9m 18s
cypress-dev (4, cypress/e2e/EnrollmentAddEventPage/ProgramStageSelector/ProgramStageSelector.feat...	9m 6s
cypress-dev (5, cypress/e2e/EnrollmentEditEventPage/EnrollmentEditEventPageForm/EnrollmentEditEve...	13m 55s
release	42s
	54m 22s

Provide feedback