исправлено вроде все с конфликтами - форма загружается, названия на одном языке

SushiBar/FormMain.Designer.cs

@@ -150,6 +150,7 @@
             MainMenuStrip = menuStrip1;
             Name = "FormMain";
             Text = "Суши Бар";
+            Load += FormMain_Load;
             menuStrip1.ResumeLayout(false);
             menuStrip1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();

SushiBar/FormSushi.Designer.cs

@@ -218,7 +218,7 @@
             Font = new Font("Candara", 10.2F, FontStyle.Regular, GraphicsUnit.Point, 204);
             Margin = new Padding(3, 4, 3, 4);
             Name = "FormSushi";
-            Text = "FormSushi";
+            Text = "Суши";
             Load += FormSushi_Load;
             groupBoxComponents.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();

SushiBar/FormSushis.Designer.cs

@@ -106,7 +106,7 @@
             Controls.Add(buttonAddSushi);
             Controls.Add(dataGridView);
             Name = "FormSushis";
-            Text = "FormSushis";
+            Text = "Суши";
             Load += FormSushis_Load;
             ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
             ResumeLayout(false);

SushiBar/Program.cs

@@ -12,6 +12,8 @@ namespace SushiBar
 {
     internal static class Program
     {
+        //<<<<<<< HEAD=======
+        // ïîïûòêà èñïðàâèòü ãê >>>>>>> 194224615c9ce8063382a619ef3c0a5ba4dafd57
         private static ServiceProvider? _serviceProvider;
         public static ServiceProvider? ServiceProvider => _serviceProvider;