diff --git a/Francesco.Recipes.World/Data/FrancescosRecipesWorldDbContext.cs b/Francesco.Recipes.World/Data/FrancescosRecipesWorldDbContext.cs
index 6a691b5..0f6c858 100644
--- a/Francesco.Recipes.World/Data/FrancescosRecipesWorldDbContext.cs
+++ b/Francesco.Recipes.World/Data/FrancescosRecipesWorldDbContext.cs
@@ -1,22 +1,20 @@
 namespace Francesco.Recipes.World.Data
 {
-<<<<<<< HEAD
     using Francesco.Recipes.World.Models.BackendModels;
     using Francesco.Recipes.World.Models.BackendModels.Category;
     using Francesco.Recipes.World.Models.BackendModels.Favorit;
-=======
-    using Francesco.Recipes.World.Models.BackendModels.Category;
->>>>>>> parent of 45702aa (Correct Models Unit and Category)
     using Francesco.Recipes.World.Models.BackendModels.Ingredient;
+    using Francesco.Recipes.World.Models.BackendModels.IngredientShoppingList;
     using Francesco.Recipes.World.Models.BackendModels.Instruction;
+    using Francesco.Recipes.World.Models.BackendModels.MediaFile;
     using Francesco.Recipes.World.Models.BackendModels.Recipe;
     using Francesco.Recipes.World.Models.BackendModels.RecipeIngredient;
+    using Francesco.Recipes.World.Models.BackendModels.Shoppinglist;
     using Francesco.Recipes.World.Models.BackendModels.Unit;
     using Microsoft.EntityFrameworkCore;
 
     public class FrancescosRecipesWorldDbContext : DbContext
     {
-<<<<<<< HEAD
         public FrancescosRecipesWorldDbContext(DbContextOptions<FrancescosRecipesWorldDbContext> options)
             : base(options)
         {
@@ -105,18 +103,5 @@
             new Unit { Id = Guid.Parse("24a91b89-3389-4465-89e4-2f70d2ea6fd7"), Name = "esslöffel", Symbol = "EL" },
         ];
         }
-=======
-        public FrancescosRecipesWorldDbContext(DbContextOptions<FrancescosRecipesWorldDbContext> options) 
-            : base(options) 
-        { 
-        }
-
-        public DbSet<Category> Categories => Set<Category>();
-        public DbSet<Ingredient> Ingredients => Set<Ingredient>();
-        public DbSet<Instruction> Instructions => Set<Instruction>();
-        public DbSet<Recipe> Recipes => Set<Recipe>();
-        public DbSet<RecipeIngredient> RecipeIngredients => Set<RecipeIngredient>();
-        public DbSet<Unit> Units => Set<Unit>();
->>>>>>> parent of 45702aa (Correct Models Unit and Category)
     }
 }
diff --git a/Francesco.Recipes.World/Migrations/20250318105823_InitialMigration.Designer.cs b/Francesco.Recipes.World/Migrations/20250318150949_InitialMIgration.Designer.cs
similarity index 97%
rename from Francesco.Recipes.World/Migrations/20250318105823_InitialMigration.Designer.cs
rename to Francesco.Recipes.World/Migrations/20250318150949_InitialMIgration.Designer.cs
index ac67bcb..3f89444 100644
--- a/Francesco.Recipes.World/Migrations/20250318105823_InitialMigration.Designer.cs
+++ b/Francesco.Recipes.World/Migrations/20250318150949_InitialMIgration.Designer.cs
@@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace Francesco.Recipes.World.Migrations
 {
     [DbContext(typeof(FrancescosRecipesWorldDbContext))]
-    [Migration("20250318105823_InitialMigration")]
-    partial class InitialMigration
+    [Migration("20250318150949_InitialMIgration")]
+    partial class InitialMIgration
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -32,6 +32,7 @@ namespace Francesco.Recipes.World.Migrations
                         .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
+                        .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
                     b.HasKey("Id");
@@ -112,6 +113,7 @@ namespace Francesco.Recipes.World.Migrations
                         .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
+                        .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
                     b.HasKey("Id");
@@ -147,9 +149,11 @@ namespace Francesco.Recipes.World.Migrations
                         .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Description")
+                        .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("Number")
+                        .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
                     b.Property<Guid>("RecipeId")
@@ -219,7 +223,11 @@ namespace Francesco.Recipes.World.Migrations
                     b.Property<bool>("IsFavorite")
                         .HasColumnType("bit");
 
+                    b.Property<DateTime?>("ModifiedAt")
+                        .HasColumnType("datetime2");
+
                     b.Property<string>("Name")
+                        .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
                     b.Property<TimeSpan>("PreparationTime")
@@ -275,6 +283,9 @@ namespace Francesco.Recipes.World.Migrations
                     b.Property<DateTime>("CreatedAt")
                         .HasColumnType("datetime2");
 
+                    b.Property<DateTime?>("ModifiedAt")
+                        .HasColumnType("datetime2");
+
                     b.HasKey("Id");
 
                     b.ToTable("ShoppingLists");
@@ -287,9 +298,11 @@ namespace Francesco.Recipes.World.Migrations
                         .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
+                        .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("Symbol")
+                        .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
                     b.HasKey("Id");
diff --git a/Francesco.Recipes.World/Migrations/20250318105823_InitialMigration.cs b/Francesco.Recipes.World/Migrations/20250318150949_InitialMIgration.cs
similarity index 96%
rename from Francesco.Recipes.World/Migrations/20250318105823_InitialMigration.cs
rename to Francesco.Recipes.World/Migrations/20250318150949_InitialMIgration.cs
index 1e8d90d..2b14663 100644
--- a/Francesco.Recipes.World/Migrations/20250318105823_InitialMigration.cs
+++ b/Francesco.Recipes.World/Migrations/20250318150949_InitialMIgration.cs
@@ -8,12 +8,12 @@ using Microsoft.EntityFrameworkCore.Migrations;
 namespace Francesco.Recipes.World.Migrations
 {
     /// <inheritdoc />
-    public partial class InitialMigration : Migration
+    public partial class InitialMIgration : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            if (migrationBuilder == null)
+            if (migrationBuilder is null)
             {
                 throw new ArgumentNullException(nameof(migrationBuilder));
             }
@@ -22,7 +22,7 @@ namespace Francesco.Recipes.World.Migrations
                 columns: table => new
                 {
                     Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                    Name = table.Column<string>(type: "nvarchar(max)", nullable: false)
                 },
                 constraints: table =>
                 {
@@ -46,7 +46,7 @@ namespace Francesco.Recipes.World.Migrations
                 columns: table => new
                 {
                     Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                    Name = table.Column<string>(type: "nvarchar(max)", nullable: false)
                 },
                 constraints: table =>
                 {
@@ -58,7 +58,8 @@ namespace Francesco.Recipes.World.Migrations
                 columns: table => new
                 {
                     Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false)
+                    CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    ModifiedAt = table.Column<DateTime>(type: "datetime2", nullable: true)
                 },
                 constraints: table =>
                 {
@@ -70,8 +71,8 @@ namespace Francesco.Recipes.World.Migrations
                 columns: table => new
                 {
                     Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    Symbol = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                    Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Symbol = table.Column<string>(type: "nvarchar(max)", nullable: false)
                 },
                 constraints: table =>
                 {
@@ -83,7 +84,7 @@ namespace Francesco.Recipes.World.Migrations
                 columns: table => new
                 {
                     Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Name = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
                     Description = table.Column<string>(type: "nvarchar(max)", nullable: true),
                     Difficulty = table.Column<int>(type: "int", nullable: false),
                     Servings = table.Column<int>(type: "int", nullable: false),
@@ -91,6 +92,7 @@ namespace Francesco.Recipes.World.Migrations
                     CookingTime = table.Column<TimeSpan>(type: "time", nullable: false),
                     IsFavorite = table.Column<bool>(type: "bit", nullable: false),
                     CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    ModifiedAt = table.Column<DateTime>(type: "datetime2", nullable: true),
                     FavoritId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
                     CategoryId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
                 },
@@ -140,8 +142,8 @@ namespace Francesco.Recipes.World.Migrations
                 columns: table => new
                 {
                     Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Description = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    Number = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Description = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Number = table.Column<string>(type: "nvarchar(max)", nullable: false),
                     RecipeId = table.Column<Guid>(type: "uniqueidentifier", nullable: false)
                 },
                 constraints: table =>
@@ -304,7 +306,7 @@ namespace Francesco.Recipes.World.Migrations
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            if (migrationBuilder == null)
+            if (migrationBuilder is null)
             {
                 throw new ArgumentNullException(nameof(migrationBuilder));
             }
diff --git a/Francesco.Recipes.World/Migrations/FrancescosRecipesWorldDbContextModelSnapshot.cs b/Francesco.Recipes.World/Migrations/FrancescosRecipesWorldDbContextModelSnapshot.cs
index 06d6ff4..e24e960 100644
--- a/Francesco.Recipes.World/Migrations/FrancescosRecipesWorldDbContextModelSnapshot.cs
+++ b/Francesco.Recipes.World/Migrations/FrancescosRecipesWorldDbContextModelSnapshot.cs
@@ -29,6 +29,7 @@ namespace Francesco.Recipes.World.Migrations
                         .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
+                        .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
                     b.HasKey("Id");
@@ -109,6 +110,7 @@ namespace Francesco.Recipes.World.Migrations
                         .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
+                        .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
                     b.HasKey("Id");
@@ -144,9 +146,11 @@ namespace Francesco.Recipes.World.Migrations
                         .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Description")
+                        .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("Number")
+                        .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
                     b.Property<Guid>("RecipeId")
@@ -216,7 +220,11 @@ namespace Francesco.Recipes.World.Migrations
                     b.Property<bool>("IsFavorite")
                         .HasColumnType("bit");
 
+                    b.Property<DateTime?>("ModifiedAt")
+                        .HasColumnType("datetime2");
+
                     b.Property<string>("Name")
+                        .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
                     b.Property<TimeSpan>("PreparationTime")
@@ -272,6 +280,9 @@ namespace Francesco.Recipes.World.Migrations
                     b.Property<DateTime>("CreatedAt")
                         .HasColumnType("datetime2");
 
+                    b.Property<DateTime?>("ModifiedAt")
+                        .HasColumnType("datetime2");
+
                     b.HasKey("Id");
 
                     b.ToTable("ShoppingLists");
@@ -284,9 +295,11 @@ namespace Francesco.Recipes.World.Migrations
                         .HasColumnType("uniqueidentifier");
 
                     b.Property<string>("Name")
+                        .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("Symbol")
+                        .IsRequired()
                         .HasColumnType("nvarchar(max)");
 
                     b.HasKey("Id");
diff --git a/Francesco.Recipes.World/Models/BackendModels/Category/Category.cs b/Francesco.Recipes.World/Models/BackendModels/Category/Category.cs
index 64934a2..5fa42d4 100644
--- a/Francesco.Recipes.World/Models/BackendModels/Category/Category.cs
+++ b/Francesco.Recipes.World/Models/BackendModels/Category/Category.cs
@@ -4,7 +4,7 @@
     public class Category
     {
         public Guid Id { get; set; }
-        public string? Name { get; set; }
+        public string Name { get; set; }
         public virtual ICollection<Recipe> Recipes { get; set; } = new List<Recipe>();
     }
 }
diff --git a/Francesco.Recipes.World/Models/BackendModels/Unit/Unit.cs b/Francesco.Recipes.World/Models/BackendModels/Unit/Unit.cs
index 902657a..e11bce3 100644
--- a/Francesco.Recipes.World/Models/BackendModels/Unit/Unit.cs
+++ b/Francesco.Recipes.World/Models/BackendModels/Unit/Unit.cs
@@ -7,8 +7,8 @@ namespace Francesco.Recipes.World.Models.BackendModels.Unit
     public class Unit
     {
         public Guid Id{ get; set; }
-        public string? Name { get; set; }
-        public string? Symbol { get; set; }
+        public string Name { get; set; }
+        public string Symbol { get; set; }
         public virtual ICollection<RecipeIngredient> RecipeIngredient { get; set; } = new List<RecipeIngredient>();
     } 
 }