resolve merge confligts?

Pilz.Drawing.Drawing3D.OpenGLRenderer/Pilz.Drawing.Drawing3D.OpenGLFactory.vbproj

@@ -31,8 +31,6 @@
   <ItemGroup>
     <PackageReference Include="OpenTK.Input" Version="4.8.2" />
     <PackageReference Include="OpenTK.WinForms" Version="4.0.0-pre.6" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OpenTK" Version="4.8.2" />

Pilz.Drawing.Drawing3D.OpenGLRenderer/Rendering/ContentPipe.vb

@@ -1,19 +1,9 @@
-' Nicht gemergte Änderung aus Projekt "Pilz.Drawing.Drawing3D.OpenGLFactory (net6.0-windows)" 
+Imports System.Drawing.Imaging
-' Vor:
-' Imports OpenTK
-' Imports OpenTK.Graphics.OpenGL
-' Imports System.Drawing
-' Nach:
-' Imports System.Drawing
-' Imports System.Drawing.Imaging
-' 
-' Imports OpenTK
-.Drawing
-Imports System.Drawing.Imaging
 
 Imports OpenTK.Graphics.OpenGL
 
 Imports Bitmap = System.Drawing.Bitmap
+Imports System.Drawing
 
 Namespace RenderingN