fix conflict

Shipyard/Shipyard/FormDetail.Designer.cs

@@ -1,4 +1,4 @@
-namespace Shipyard
+namespace ShipyardView
 {
     partial class FormDetail
     {

Shipyard/Shipyard/FormDetail.cs

@@ -3,7 +3,7 @@ using ShipyardContracts.BindingModels;
 using ShipyardContracts.BusinessLogicsContracts;
 using ShipyardContracts.SearchModels;
 
-namespace Shipyard
+namespace ShipyardView
 {
     public partial class FormDetail : Form
     {

Shipyard/Shipyard/FormDetails.cs

@@ -1,6 +1,5 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualBasic.Logging;
-using Shipyard;
 using ShipyardContracts.BindingModels;
 using ShipyardContracts.BusinessLogicsContracts;
 using System;

Shipyard/Shipyard/FormMain.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.Logging;
-using Shipyard;
 using ShipyardContracts.BindingModels;
 using ShipyardContracts.BusinessLogicsContracts;
 using ShipyardDataModels.Enums;

Shipyard/Shipyard/FormShip.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.Logging;
-using Shipyard;
 using ShipyardContracts.BindingModels;
 using ShipyardContracts.BusinessLogicsContracts;
 using ShipyardContracts.SearchModels;

Shipyard/Shipyard/FormShips.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.Logging;
-using Shipyard;
 using ShipyardContracts.BindingModels;
 using ShipyardContracts.BusinessLogicsContracts;
 using System;

Shipyard/Shipyard/Program.cs

@@ -4,10 +4,10 @@ using NLog.Extensions.Logging;
 using ShipyardBusinessLogic.BusinessLogics;
 using ShipyardContracts.BusinessLogicsContracts;
 using ShipyardContracts.StoragesContracts;
-using ShipyardView;
-using ShipyardFileImplement.Implements;
+using ShipyardListImplement.Implements;
 
-namespace Shipyard
+
+namespace ShipyardView
 {
     internal static class Program
     {