diff --git a/INT_PT002/Forms/FormMain.cs b/INT_PT002/Forms/FormMain.cs
index 5773005..3c706a2 100644
--- a/INT_PT002/Forms/FormMain.cs
+++ b/INT_PT002/Forms/FormMain.cs
@@ -246,7 +246,11 @@ 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;