diff --git a/cmd/main-migration/migrations/atlas.sum b/cmd/main-migration/migrations/atlas.sum
index c02dc2b8..bdc2efaf 100644
--- a/cmd/main-migration/migrations/atlas.sum
+++ b/cmd/main-migration/migrations/atlas.sum
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 h1:oIkzjGilKCqqfLGlvMc2I2WwJ8zQgdMeTWy25k1uaLI=
+=======
+h1:fkwkWe2PSYaTNxdTEmwe747+bhXV+kOcly/gC7dq/Q8=
+>>>>>>> migration
 20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k=
 20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0=
 20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI=
@@ -132,4 +136,3 @@ h1:oIkzjGilKCqqfLGlvMc2I2WwJ8zQgdMeTWy25k1uaLI=
 20251125125303.sql h1:4JSFv1Pmhbe9tqpLXgO63OwYnGsalStgUXKVWPyc1YE=
 20251126064057.sql h1:vAdhz5Nn/gGJy0UKZAEldeXv8HpHtJU/t8ygDVIbTsU=
 20251201081333.sql h1:PoC8ADRdwDuohDTB74yW/DaB42igdYa4B6humbrEJBk=
-20251201104439.sql h1:EIBP67qeQWEYMdMOM/gouXzkAM4R3vSkmuw4Fe8usOs=
diff --git a/internal/domain/references/clinical/clinical.go b/internal/domain/references/clinical/clinical.go
index 7a3a2ec1..f6c1b572 100644
--- a/internal/domain/references/clinical/clinical.go
+++ b/internal/domain/references/clinical/clinical.go
@@ -23,6 +23,7 @@ type (
 	LangClassCode         string
 	TranslatorSrcCode     string
 	ScreeningFormTypeCode string
+<<<<<<< HEAD
 	SurgerySizeCode       string
 	SurgerySystemCode     string
 	SurgeryTypeCode       string
@@ -30,6 +31,8 @@ type (
 	BornMortalityCode     string
 	BornLocationCode      string
 	SpecimentDestCode     string
+=======
+>>>>>>> migration
 )
 
 const (
@@ -198,6 +201,7 @@ const (
 
 	SFTCA ScreeningFormTypeCode = "form-a" // Formu A
 	SFTCB ScreeningFormTypeCode = "form-b" // Formu B
+<<<<<<< HEAD
 
 	SSCSmall   SurgerySizeCode = ""
 	SSCMedium  SurgerySizeCode = ""
@@ -230,6 +234,8 @@ const (
 	SDCMicro SpecimentDestCode = ""
 	SDCLab   SpecimentDestCode = ""
 	SDCNone  SpecimentDestCode = ""
+=======
+>>>>>>> migration
 )
 
 type Soapi struct {