no message

INT_PT002/Forms/FormMain.cs

@@ -246,11 +246,8 @@ namespace INT_PT002.Forms
         }
         private void CreateForm()
         {
-<<<<<<< HEAD
             this.ChildFormMainDisplay = new FormMainDisplay3(this);
-=======
-            this.ChildFormMainDisplay = new FormMainDisplay4(this);
->>>>>>> main
+
             this.ChildFormMenu = new FormMenu(this);
 
             this.smartForm1.MainForm = this;