diff --git a/CargoHub/Models/Client.cs b/CargoHub/Models/Client.cs
index b96358d..86de3ee 100644
--- a/CargoHub/Models/Client.cs
+++ b/CargoHub/Models/Client.cs
@@ -4,6 +4,7 @@ namespace CargoHub.Models
 {
     public class Client : BaseModel
     {
+<<<<<<< Updated upstream
         [JsonPropertyName("name")]
         public required string? Name { get; set; }
         [JsonPropertyName("address")]
@@ -19,6 +20,14 @@ public class Client : BaseModel
         public required string? Province { get; set; }
         [JsonPropertyName("country")]
 
+=======
+        public required string? Name { get; set; }
+        public required string? Address { get; set; }
+        public required string? City { get; set; }
+        [JsonPropertyName("zip_code")]
+        public required string? ZipCode { get; set; }
+        public required string? Province { get; set; }
+>>>>>>> Stashed changes
         public required string? Country { get; set; }
         [JsonPropertyName("contact_name")]
         public required string? ContactName { get; set; }
diff --git a/CargoHub/Models/Inventory.cs b/CargoHub/Models/Inventory.cs
index f1dd748..6a04228 100644
--- a/CargoHub/Models/Inventory.cs
+++ b/CargoHub/Models/Inventory.cs
@@ -11,8 +11,12 @@ public class Inventory : BaseModel
 
         [JsonPropertyName("item_id")]
         public required string? ItemId { get; set; }
+<<<<<<< Updated upstream
         [JsonPropertyName("description")]
 
+=======
+        
+>>>>>>> Stashed changes
         public required string? Description { get; set; }
 
         [JsonPropertyName("item_reference")]
diff --git a/CargoHub/Models/Item.cs b/CargoHub/Models/Item.cs
index 8832dab..77bb35b 100644
--- a/CargoHub/Models/Item.cs
+++ b/CargoHub/Models/Item.cs
@@ -14,7 +14,11 @@ public class Item : BaseModel, IContainsClassification
         [Key]
         [JsonPropertyName("uid")]
 
+<<<<<<< Updated upstream
         public string? Uid { get; set; } = string.Empty;
+=======
+        public string? Uid { get; set; }
+>>>>>>> Stashed changes
         [JsonPropertyName("code")]
 
         public required string? Code { get; set; }
@@ -34,25 +38,25 @@ public class Item : BaseModel, IContainsClassification
         public required string? CommodityCode { get; set; }
 
         [JsonPropertyName("item_line")]
-        public required int ItemLine { get; set; }
+        public required int? ItemLine { get; set; }
 
         [JsonPropertyName("item_group")]
-        public required int ItemGroup { get; set; }
+        public required int? ItemGroup { get; set; }
 
         [JsonPropertyName("item_type")]
-        public required int ItemType { get; set; }
+        public required int? ItemType { get; set; }
 
         [JsonPropertyName("unit_purchase_quantity")]
-        public required int UnitPurchaseQuantity { get; set; }
+        public required int? UnitPurchaseQuantity { get; set; }
 
         [JsonPropertyName("unit_order_quantity")]
-        public required int UnitOrderQuantity { get; set; }
+        public required int? UnitOrderQuantity { get; set; }
 
         [JsonPropertyName("pack_order_quantity")]
-        public required int PackOrderQuantity { get; set; }
+        public required int? PackOrderQuantity { get; set; }
 
         [JsonPropertyName("supplier_id")]
-        public required int SupplierId { get; set; }
+        public required int? SupplierId { get; set; }
 
         [JsonPropertyName("supplier_code")]
         public required string? SupplierCode { get; set; }
diff --git a/CargoHub/Models/ItemGroup.cs b/CargoHub/Models/ItemGroup.cs
index 6c455db..b3a9ea2 100644
--- a/CargoHub/Models/ItemGroup.cs
+++ b/CargoHub/Models/ItemGroup.cs
@@ -5,10 +5,14 @@ namespace CargoHub.Models
 {
     public class ItemGroup : BaseModel
     {
+<<<<<<< Updated upstream
         [JsonPropertyName("name")]
         public required string? Name {get;set;}
         [JsonPropertyName("description")]
 
+=======
+        public required string? Name {get;set;}
+>>>>>>> Stashed changes
         public required string? Description {get;set;}
     }
 }
diff --git a/CargoHub/Models/ItemLine.cs b/CargoHub/Models/ItemLine.cs
index 68d4c9b..5812be8 100644
--- a/CargoHub/Models/ItemLine.cs
+++ b/CargoHub/Models/ItemLine.cs
@@ -5,11 +5,15 @@ namespace CargoHub.Models
 {
     public class ItemLine : BaseModel
     {
+<<<<<<< Updated upstream
         [JsonPropertyName("name")]
 
         public required string? Name {get;set;}
         [JsonPropertyName("description")]
 
+=======
+        public required string? Name {get;set;}
+>>>>>>> Stashed changes
         public required string? Description {get;set;}
     }
 }
diff --git a/CargoHub/Models/ItemType.cs b/CargoHub/Models/ItemType.cs
index 56e9460..8052270 100644
--- a/CargoHub/Models/ItemType.cs
+++ b/CargoHub/Models/ItemType.cs
@@ -5,11 +5,15 @@ namespace CargoHub.Models
 
     public class ItemType : BaseModel
     {
+<<<<<<< Updated upstream
         [JsonPropertyName("name")]
 
         public required string? Name {get;set;}
         [JsonPropertyName("description")]
 
+=======
+        public required string? Name {get;set;}
+>>>>>>> Stashed changes
         public required string? Description {get;set;}
     }
 }
diff --git a/CargoHub/Models/Location.cs b/CargoHub/Models/Location.cs
index d7441a7..3d1ae5d 100644
--- a/CargoHub/Models/Location.cs
+++ b/CargoHub/Models/Location.cs
@@ -17,8 +17,11 @@ public class Location : BaseModel, IContainsClassification
         public string? Code { get; set; } // Nullable based on provided JSON
         [JsonIgnore]
         public ICollection<Inventory> Inventories { get; } = [];
+<<<<<<< Updated upstream
         [JsonPropertyName("name")]
 
+=======
+>>>>>>> Stashed changes
         public required string? Name { get; set; }
         [JsonIgnore]
         public List<Classification> Classifications { get; set; } = [];
diff --git a/CargoHub/Rest/Migrate.rest b/CargoHub/Rest/Migrate.rest
index e684b29..9dc9079 100644
--- a/CargoHub/Rest/Migrate.rest
+++ b/CargoHub/Rest/Migrate.rest
@@ -1,3 +1,10 @@
+<<<<<<< Updated upstream
 @baseUrl = http://localhost:3000/api/v2/DataTransfer
 
 POST {{baseUrl}}?FolderName=data
+=======
+@baseUrl = http://localhost:3000/api/v2/Migrations
+POST {{baseUrl}}?FolderName=data
+apikey: 4125a7b2-7ef8-4c4f-9ff9-3386c0dbcb5c
+
+>>>>>>> Stashed changes