[OE-3987] added conflict resolution for patient OphInfo (CVI status). refactored conflict detection code.