Conflicts: lib/core/viewModel/PatientSearchViewModel.dart lib/screens/patients/PatientsInPatientScreen.dart lib/screens/patients/out_patient/out_patient_screen.dart lib/screens/patients/patient_search/patient_search_result_screen.dart lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart lib/screens/sick-leave/add-sickleave.dart