fix: resolve conflict

app/models/encounter.ts

@@ -1,6 +1,7 @@
 import type { DeathCause } from "./death-cause"
 import { type Doctor, genDoctor } from "./doctor"
 import { genEmployee, type Employee } from "./employee"
+import type { EncounterDocument } from "./encounter-document"
 import type { InternalReference } from "./internal-reference"
 import { type Patient, genPatient } from "./patient"
 import type { Specialist } from "./specialist"
@@ -38,6 +39,7 @@ export interface Encounter {
     deathCause?: DeathCause
     paymentMethod_code?: string
     status_code: string
+    encounterDocuments: EncounterDocument[]
 }
 
 export function genEncounter(): Encounter {
@@ -55,7 +57,8 @@ export function genEncounter(): Encounter {
         appointment_doctor_id: 0,
         appointment_doctor: genDoctor(),
         medicalDischargeEducation: '',
-        status_code: ''
+        status_code: '',
+        encounterDocuments: [],
     }
 }