fixed merge conflict

src/fiber_package/entity/person.py

@@ -39,13 +39,8 @@ class PersonModel(FiberBaseModel):
     @model_validator(mode="after")
     def generate_full_name(self) -> Self:
         full_name = self.first_name
-<<<<<<< HEAD
-        if self.infix:
-            full_name += " " + self.infix
-=======
         if self.infix_name:
             full_name += " " + self.infix_name
->>>>>>> tiago/db_structure
         full_name += " " + self.last_name
         self.full_name = full_name
         return self

src/fiber_package/system/association.py

@@ -1,17 +0,0 @@
-from fiber_package.base import FiberBaseModel
-from fiber_package.refs import EntityRefList, CommitteeRefList, GuildRefList
-
-
-class AssociationModel(FiberBaseModel):
-    full_name: str
-    members: EntityRefList
-    alumni: EntityRefList
-    extern: EntityRefList
-    committees: CommitteeRefList
-    guilds: GuildRefList
-
-
-    # TODO: also add former_members, alumns, etc... ?
-    # events: GroupList
-    # activities: GroupList
-    # mailings: GroupList