Resolve conflict

Author: LeafShi1

src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/TreeViewTest.Designer.cs

@@ -10,4 +10,14 @@ public TreeViewTest()
     {
         InitializeComponent();
     }
+
+    private void treeView1_DrawNode(object sender, DrawTreeNodeEventArgs e)
+    {
+        e.DrawDefault = true;
+    }
+
+    private void button3_Click(object sender, EventArgs e)
+    {
+        treeView1.DrawMode = TreeViewDrawMode.OwnerDrawText;
+    }
 }

src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/TreeViewTest.cs

@@ -11,6 +11,7 @@
     "System.Windows.Forms.NoClientNotifications": false,
     "System.Windows.Forms.ScaleTopLevelFormMinMaxSizeForDpi": false,
     "System.Windows.Forms.ServicePointManagerCheckCrl": false,
-    "System.Windows.Forms.TrackBarModernRendering": false
+    "System.Windows.Forms.TrackBarModernRendering": false,
+    "System.Windows.Forms.TreeView.MoveTreeViewTextLocOnePixel": false
   }
 }