- merge was completely fucked. Should be fixed now

MV_Abnehmerplatine_FT24/MV_Abnehmerplatine.kicad_sch

@@ -1669,6 +1669,12 @@
 		(color 0 0 0 0)
 		(uuid "5c95a2d6-ce51-4f34-9bc8-57c9abed2e41")
 	)
+	(junction
+		(at 262.89 97.79)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "60fd22f7-bdd0-4e51-8fe5-7e744a9a2927")
+	)
 	(junction
 		(at 91.44 93.98)
 		(diameter 0)
@@ -2449,6 +2455,16 @@
 		)
 		(uuid "8ce9489e-9e34-415e-8143-eb4b70153551")
 	)
+	(wire
+		(pts
+			(xy 259.08 97.79) (xy 262.89 97.79)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "905ac7b1-908f-4c37-9602-967e6585d16b")
+	)
 	(wire
 		(pts
 			(xy 95.25 163.83) (xy 105.41 163.83)
@@ -6527,6 +6543,7 @@
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
+		(fields_autoplaced yes)
 		(uuid "69204f80-1e86-4498-bbfc-cfbb9623a95b")
 		(property "Reference" "TP11"
 			(at 255.778 95.25 90)
@@ -8196,8 +8213,6 @@
 		)
 	)
 	(symbol
-<<<<<<< HEAD
-=======
 		(lib_id "Connector:TestPoint")
 		(at 259.08 97.79 90)
 		(mirror x)
@@ -8264,7 +8279,6 @@
 		)
 	)
 	(symbol
->>>>>>> 07d39d5 (- MV_Abnehmerplatine is fertig)
 		(lib_name "+3V3_1")
 		(lib_id "power:+3V3")
 		(at 24.13 161.29 0)
@@ -10780,7 +10794,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "MV_Abnehmerplatine:524652070"
+		(property "Footprint" "MV_Abnehmerplatine:533092070"
 			(at 267.97 77.47 0)
 			(effects
 				(font