diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs
index 8da44ba47..c36db3dfb 100644
--- a/Configuration/GlobalAssemblyInfo.cs
+++ b/Configuration/GlobalAssemblyInfo.cs
@@ -15,13 +15,9 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "0";
 	public const string Build = "0";
-<<<<<<< HEAD
-	public const string Revision = "1148";
-=======
-	public const string Revision = "1227";
->>>>>>> 2771314915f95d258994dd05937aa433c8a33e0b
 
-        public const string MainVersion = Major + "." + Minor;
+	public const string Revision = "1227";
+    public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
 }
 	
diff --git a/VisualPascalABCNET/VisualPascalABCNET.csproj b/VisualPascalABCNET/VisualPascalABCNET.csproj
index 0babcaf44..cd96a109e 100644
--- a/VisualPascalABCNET/VisualPascalABCNET.csproj
+++ b/VisualPascalABCNET/VisualPascalABCNET.csproj
@@ -170,7 +170,9 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="DS\NavigationManager.cs" />
-    <Compile Include="DS\CodeCompletionVisual\CodeCompletionListView.cs" />
+    <Compile Include="DS\CodeCompletionVisual\CodeCompletionListView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="DS\CodeCompletionVisual\CodeCompletionWindow.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -309,13 +311,17 @@
       <DependentUpon>BreakpointCondition.cs</DependentUpon>
     </Compile>
     <Compile Include="IB\Debugger\Debugger.cs" />
-    <Compile Include="IB\Debugger\DynamicTreeView.cs" />
+    <Compile Include="IB\Debugger\DynamicTreeView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="IB\Debugger\ExpressionEvaluation.cs" />
     <Compile Include="IB\Debugger\Immediate.cs" />
     <Compile Include="IB\Debugger\LocalVars.cs">
     </Compile>
     <Compile Include="IB\Debugger\Utility.cs" />
-    <Compile Include="IB\FormExtensions.cs" />
+    <Compile Include="IB\FormExtensions.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="DockContent\OutputWindowForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -365,7 +371,9 @@
     <Compile Include="OptionsContent\ViewOptionsContent.Designer.cs">
       <DependentUpon>ViewOptionsContent.cs</DependentUpon>
     </Compile>
-    <Compile Include="Program.cs" />
+    <Compile Include="Program.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Config\AssemblyInfo.cs" />
     <Compile Include="Workbench\BuildService.cs" />
     <Compile Include="Workbench\DesignerService.cs">