solved some merge conflicts

VECTO/GUI/VehicleForm.vb

@@ -1505,26 +1505,6 @@ Public Class VehicleForm
 		Change()
 	End Sub
 
-    Private Sub btIHPC_Click(sender As Object, e As EventArgs) Handles btIHPC.Click
-        Dim f = FileRepl(tbIHPCFilePath.Text, GetPath(_vehFile))
-
-        If Not IHPCForm.Visible Then
-            IHPCForm.ClearIHPC()
-            IHPCForm.Show()
-        Else
-            If IHPCForm.WindowState = FormWindowState.Minimized Then IHPCForm.WindowState = FormWindowState.Normal
-            IHPCForm.BringToFront()
-        End If
-
-        If Not Trim(f) = "" Then
-            Try
-                IHPCForm.ReadIHPCFile(f)
-            Catch ex As Exception
-                MsgBox(ex.Message, MsgBoxStyle.OkOnly, "Error loading IEPC File")
-            End Try
-        End If
-	End sub
-
 	Private Sub btIEPCFilePath_Click(sender As Object, e As EventArgs) Handles btIEPCFilePath.Click
 		If IEPCFileBrowser.OpenDialog(FileRepl(tbIEPCFilePath.Text, GetPath(_vehFile))) Then
 			tbIEPCFilePath.Text = GetFilenameWithoutDirectory(IEPCFileBrowser.Files(0), GetPath(_vehFile))