diff --git a/firmware/67percent/Core/Src/main.c b/firmware/67percent/Core/Src/main.c
index fd75f93f..6645afc0 100644
--- a/firmware/67percent/Core/Src/main.c
+++ b/firmware/67percent/Core/Src/main.c
@@ -101,8 +101,8 @@ bool pq_pop(PacketQueue *q, uint8_t out_packet[PACKET_SIZE]){
 
 /* Private macro -------------------------------------------------------------*/
 /* USER CODE BEGIN PM */
-#define ROW 6
-#define COL 5
+#define ROW 5
+#define COL 8
 #define MAXQUEUE 256
 #define MODE_INACTIVE 0
 #define MODE_MAINBOARD 1
@@ -125,30 +125,38 @@ UARTMessage RX4Msg; //Buffer for messages on uart5
 
 
 SwitchPins ROW_PINS[ROW] = {
-	{GPIOB, GPIO_PIN_10},
+    {GPIOB, GPIO_PIN_10},
 	{GPIOB, GPIO_PIN_2},
 	{GPIOB, GPIO_PIN_1},
-	{GPIOB, GPIO_PIN_0},
-    {GPIOC, GPIO_PIN_5},
-    {GPIOC, GPIO_PIN_4},
+	{GPIOB, GPIO_PIN_O},
+	{GPIOC, GPIO_PIN_5},
 };
 
 SwitchPins COLUMN_PINS[COL] = {
-	{GPIOA, GPIO_PIN_8},
-	{GPIOC, GPIO_PIN_9},
-	{GPIOC, GPIO_PIN_8},
+	{GPIOB, GPIO_PIN_13},
+	{GPIOB, GPIO_PIN_14},
+	{GPIOB, GPIO_PIN_15},
+	{GPIOC, GPIO_PIN_6},
     {GPIOC, GPIO_PIN_7},
-	{GPIOC, GPIO_PIN_6}
+	{GPIOC, GPIO_PIN_8},
+	{GPIOC, GPIO_PIN_9},
+	{GPIOA, GPIO_PIN_8}
+
 };
 
 // Initialize keycodes array
 uint8_t KEYCODES[ROW][COL] = {
-    {0x00,		KEY_F13, 		KEY_F14, 		KEY_F15,			KEY_F16},
-	{KEY_F17,	NUM_LOCK,		KEYPAD_SLASH,	KEYPAD_ASTERISK, 	KEYPAD_MINUS},
-	{KEY_F18, 	KEYPAD_7,		KEYPAD_8,		KEYPAD_9,			KEYPAD_PLUS},
-	{KEY_F19,	KEYPAD_4,		KEYPAD_5,		KEYPAD_6,			0x00},
-	{KEY_F20,	KEYPAD_1,		KEYPAD_2,		KEYPAD_3,			KEYPAD_ENTER},
-	{KEY_F21,	KEYPAD_0,		0x00,			KEYPAD_DOT,			0x00}
+    { KEY_GRAVE, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0, KEY_BACKSPACE, KEY_HOME },
+
+    { KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F },
+
+    { KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F },
+
+    { KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F },
+
+    { KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F },
+
+    { KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F, KEY_F }
 };
 
 uint16_t DEPTH = 0;
diff --git a/hardware/68percent/68percent-backups/68percent-2025-11-07_213623.zip b/hardware/68percent/68percent-backups/68percent-2025-11-07_213623.zip
deleted file mode 100644
index a3e1da17..00000000
Binary files a/hardware/68percent/68percent-backups/68percent-2025-11-07_213623.zip and /dev/null differ
diff --git a/hardware/68percent/68percent-backups/68percent-2025-11-25_195038.zip b/hardware/68percent/68percent-backups/68percent-2025-11-25_195038.zip
new file mode 100644
index 00000000..a0a0b171
Binary files /dev/null and b/hardware/68percent/68percent-backups/68percent-2025-11-25_195038.zip differ
diff --git a/hardware/68percent/68percent.kicad_sch b/hardware/68percent/68percent.kicad_sch
index 09c84159..45ae24f9 100644
--- a/hardware/68percent/68percent.kicad_sch
+++ b/hardware/68percent/68percent.kicad_sch
@@ -4622,8 +4622,6 @@
 	)
 	(wire
 		(pts
-<<<<<<< HEAD
-=======
 			(xy 237.49 111.76) (xy 237.49 113.03)
 		)
 		(stroke
@@ -4634,7 +4632,6 @@
 	)
 	(wire
 		(pts
->>>>>>> hardware-65percent
 			(xy 43.18 58.42) (xy 49.53 58.42)
 		)
 		(stroke
@@ -4705,19 +4702,6 @@
 	)
 	(wire
 		(pts
-<<<<<<< HEAD
-			(xy 162.56 132.08) (xy 162.56 151.13)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "0c365f9b-ec33-45c0-bcaa-f753e4bca3a2")
-	)
-	(wire
-		(pts
-=======
->>>>>>> hardware-65percent
 			(xy 147.32 77.47) (xy 147.32 88.9)
 		)
 		(stroke
@@ -5068,19 +5052,6 @@
 	)
 	(wire
 		(pts
-<<<<<<< HEAD
-			(xy 175.26 63.5) (xy 175.26 88.9)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "477066b8-b318-4156-a17c-fbe9dd48a160")
-	)
-	(wire
-		(pts
-=======
->>>>>>> hardware-65percent
 			(xy 248.92 129.54) (xy 248.92 132.08)
 		)
 		(stroke
@@ -5101,19 +5072,6 @@
 	)
 	(wire
 		(pts
-<<<<<<< HEAD
-			(xy 154.94 132.08) (xy 154.94 147.32)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "4d52ae93-a4ca-4383-bb89-91e9056bf0db")
-	)
-	(wire
-		(pts
-=======
->>>>>>> hardware-65percent
 			(xy 119.38 129.54) (xy 113.03 129.54)
 		)
 		(stroke
@@ -5814,21 +5772,13 @@
 	)
 	(wire
 		(pts
-<<<<<<< HEAD
-			(xy 160.02 132.08) (xy 160.02 151.13)
-=======
 			(xy 180.34 74.93) (xy 180.34 88.9)
->>>>>>> hardware-65percent
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-<<<<<<< HEAD
-		(uuid "a53cb74b-b460-44ad-b050-031ab179966a")
-=======
 		(uuid "a57d5cf2-2916-462d-9d02-f6005455b75d")
->>>>>>> hardware-65percent
 	)
 	(wire
 		(pts
@@ -5932,8 +5882,6 @@
 	)
 	(wire
 		(pts
-<<<<<<< HEAD
-=======
 			(xy 175.26 63.5) (xy 175.26 88.9)
 		)
 		(stroke
@@ -5944,7 +5892,6 @@
 	)
 	(wire
 		(pts
->>>>>>> hardware-65percent
 			(xy 116.84 104.14) (xy 144.78 104.14)
 		)
 		(stroke
@@ -6045,19 +5992,6 @@
 	)
 	(wire
 		(pts
-<<<<<<< HEAD
-			(xy 180.34 74.93) (xy 180.34 88.9)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "c666df65-3b72-4b72-bdec-cf6c8e58fe74")
-	)
-	(wire
-		(pts
-=======
->>>>>>> hardware-65percent
 			(xy 182.88 74.93) (xy 182.88 88.9)
 		)
 		(stroke
@@ -6388,8 +6322,6 @@
 	)
 	(wire
 		(pts
-<<<<<<< HEAD
-=======
 			(xy 241.3 111.76) (xy 237.49 111.76)
 		)
 		(stroke
@@ -6400,7 +6332,6 @@
 	)
 	(wire
 		(pts
->>>>>>> hardware-65percent
 			(xy 222.25 101.6) (xy 231.14 101.6)
 		)
 		(stroke
@@ -6519,8 +6450,6 @@
 		)
 		(uuid "ffd7b1eb-f0cb-4e45-bbcc-845c938910c9")
 	)
-<<<<<<< HEAD
-=======
 	(label "COL13"
 		(at 165.1 76.2 270)
 		(effects
@@ -6531,7 +6460,6 @@
 		)
 		(uuid "0872e688-18d5-464b-b239-05b725809904")
 	)
->>>>>>> hardware-65percent
 	(label "ROW5"
 		(at 167.64 146.05 90)
 		(effects
@@ -6572,8 +6500,6 @@
 		)
 		(uuid "1491677d-b6de-4782-8f1b-3412b5901f80")
 	)
-<<<<<<< HEAD
-=======
 	(label "COL2"
 		(at 203.2 124.46 180)
 		(effects
@@ -6584,7 +6510,6 @@
 		)
 		(uuid "14d9996a-aa1d-461c-947b-ff3f45311543")
 	)
->>>>>>> hardware-65percent
 	(label "UART_TX_NORTH"
 		(at 49.53 92.71 180)
 		(effects
@@ -6605,8 +6530,6 @@
 		)
 		(uuid "1a741b36-5f5e-4bd0-ab79-047d4eb60e4c")
 	)
-<<<<<<< HEAD
-=======
 	(label "COL11"
 		(at 177.8 74.93 270)
 		(effects
@@ -6617,7 +6540,6 @@
 		)
 		(uuid "1bb7e52c-8660-41fe-b7b9-24d5679fd926")
 	)
->>>>>>> hardware-65percent
 	(label "COL5"
 		(at 242.57 26.67 270)
 		(effects
@@ -6628,19 +6550,6 @@
 		)
 		(uuid "1fc100fc-abc3-448f-82e1-8234efa092aa")
 	)
-<<<<<<< HEAD
-	(label "COL8"
-		(at 203.2 109.22 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right bottom)
-		)
-		(uuid "2120f686-1469-485c-a964-4af544d4c8a0")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "UART_TX_SOUTH"
 		(at 53.34 95.25 0)
 		(effects
@@ -6661,8 +6570,6 @@
 		)
 		(uuid "24f3dd47-e1e3-4f7f-8d03-05628870f1ec")
 	)
-<<<<<<< HEAD
-=======
 	(label "UART_TX_NORTH"
 		(at 123.19 129.54 0)
 		(effects
@@ -6673,7 +6580,6 @@
 		)
 		(uuid "2b2b9379-b6f0-4bcf-bddf-b2315719acaf")
 	)
->>>>>>> hardware-65percent
 	(label "Place Near VDD Ports"
 		(at 41.91 165.1 0)
 		(effects
@@ -6684,19 +6590,6 @@
 		)
 		(uuid "2bb4aae6-3cf2-49aa-87c1-180df30a6830")
 	)
-<<<<<<< HEAD
-	(label "COL12"
-		(at 203.2 119.38 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right bottom)
-		)
-		(uuid "2dd81f62-0ea1-48ba-94ce-6214aee431b5")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "ROW1"
 		(at 177.8 146.05 90)
 		(effects
@@ -6707,19 +6600,6 @@
 		)
 		(uuid "2df47b70-1930-4887-8317-8498f4292996")
 	)
-<<<<<<< HEAD
-	(label "COL1"
-		(at 160.02 76.2 270)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right bottom)
-		)
-		(uuid "35cf5703-b237-43e3-8def-1a83fcdd56a2")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "NRST"
 		(at 229.87 142.24 0)
 		(effects
@@ -6730,8 +6610,6 @@
 		)
 		(uuid "377aec81-2f9d-439a-8ff8-8351613b5a76")
 	)
-<<<<<<< HEAD
-=======
 	(label "COL6"
 		(at 203.2 114.3 180)
 		(effects
@@ -6742,7 +6620,6 @@
 		)
 		(uuid "38b93aeb-c3f7-4775-8c5d-f4fdd328edc5")
 	)
->>>>>>> hardware-65percent
 	(label "SWO"
 		(at 170.18 74.93 270)
 		(effects
@@ -6763,19 +6640,6 @@
 		)
 		(uuid "3bb57688-3b26-4654-b7b3-b2e87452539d")
 	)
-<<<<<<< HEAD
-	(label "COL7"
-		(at 182.88 74.93 270)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right bottom)
-		)
-		(uuid "40ac12a5-ccc3-4c63-8eaa-cd830bb4c50c")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "VDD"
 		(at 139.7 73.66 180)
 		(effects
@@ -6787,42 +6651,14 @@
 		(uuid "41d1ade5-8210-4054-9cb5-676e258ad061")
 	)
 	(label "COL3"
-<<<<<<< HEAD
-		(at 165.1 76.2 270)
-=======
 		(at 203.2 121.92 180)
->>>>>>> hardware-65percent
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
 			(justify right bottom)
 		)
-<<<<<<< HEAD
-		(uuid "450f42af-3bab-4873-883e-859e675ee261")
-	)
-	(label "UART_TX_NORTH"
-		(at 175.26 63.5 270)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right bottom)
-		)
-		(uuid "4908fc84-621c-47df-aa9c-5c6724d4e267")
-	)
-	(label "ROT_TIMA"
-		(at 162.56 151.13 90)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left bottom)
-		)
-		(uuid "49a74743-1f19-4803-95ce-65fbcfcf3666")
-=======
 		(uuid "4665b37a-1cc0-472f-9aaa-24e2ffcaec18")
->>>>>>> hardware-65percent
 	)
 	(label "COL3"
 		(at 237.49 26.67 270)
@@ -6844,8 +6680,6 @@
 		)
 		(uuid "4f52174a-7166-4096-85f8-c4b3064c9d92")
 	)
-<<<<<<< HEAD
-=======
 	(label "COL14"
 		(at 162.56 76.2 270)
 		(effects
@@ -6856,7 +6690,6 @@
 		)
 		(uuid "51b3d42b-59cf-4c8b-8004-acd7db548d6b")
 	)
->>>>>>> hardware-65percent
 	(label "VDD"
 		(at 33.02 152.4 0)
 		(effects
@@ -6867,19 +6700,6 @@
 		)
 		(uuid "52f6274d-9319-425e-9856-6028f0c4375f")
 	)
-<<<<<<< HEAD
-	(label "COL6"
-		(at 180.34 74.93 270)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right bottom)
-		)
-		(uuid "55ef1033-52ad-4a4c-abb2-4a87f669e520")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "COL4"
 		(at 240.03 26.67 270)
 		(effects
@@ -6900,19 +6720,6 @@
 		)
 		(uuid "5795c40c-5423-450b-aa2a-1bd4abcf5b2c")
 	)
-<<<<<<< HEAD
-	(label "COL9"
-		(at 203.2 111.76 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right bottom)
-		)
-		(uuid "5972eccf-3778-4255-b912-a7f3aa8a6514")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "D+"
 		(at 231.14 99.06 180)
 		(effects
@@ -6923,19 +6730,6 @@
 		)
 		(uuid "5a0b3c86-9793-44d1-a2d8-9600402ced23")
 	)
-<<<<<<< HEAD
-	(label "COL4"
-		(at 167.64 76.2 270)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right bottom)
-		)
-		(uuid "5a35616b-57aa-45a3-9a4c-738dea73386b")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "NRST"
 		(at 133.35 106.68 180)
 		(effects
@@ -6946,19 +6740,6 @@
 		)
 		(uuid "5d2adaf2-8f8b-4999-9547-ccedb6613e09")
 	)
-<<<<<<< HEAD
-	(label "COL15"
-		(at 203.2 127 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right bottom)
-		)
-		(uuid "5e32798c-498a-4ed5-abb2-ce1d9bb0940a")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "SWO"
 		(at 229.87 144.78 0)
 		(effects
@@ -6969,10 +6750,6 @@
 		)
 		(uuid "5ecab8f8-63a0-4572-9b85-28a525a98633")
 	)
-<<<<<<< HEAD
-	(label "UART_RX_SOUTH"
-		(at 147.32 154.94 90)
-=======
 	(label "UART_RX_NORTH"
 		(at 147.32 139.7 270)
 		(effects
@@ -6985,18 +6762,13 @@
 	)
 	(label "UART_RX_SOUTH"
 		(at 172.72 78.74 90)
->>>>>>> hardware-65percent
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
 			(justify left bottom)
 		)
-<<<<<<< HEAD
-		(uuid "64a8185d-c8c9-437e-aa1e-0840591f81c7")
-=======
 		(uuid "63fc0654-be18-4f2a-a55b-53555edbe2c2")
->>>>>>> hardware-65percent
 	)
 	(label "UART_TX_WEST"
 		(at 49.53 107.95 180)
@@ -7009,8 +6781,6 @@
 		(uuid "6a08174c-d5da-4dc2-99f0-c0d2873ea18b")
 	)
 	(label "COL10"
-<<<<<<< HEAD
-=======
 		(at 180.34 74.93 270)
 		(effects
 			(font
@@ -7031,7 +6801,6 @@
 		(uuid "6b5fc549-d58c-4de2-b4bb-118b4976d050")
 	)
 	(label "COL10"
->>>>>>> hardware-65percent
 		(at 255.27 26.67 270)
 		(effects
 			(font
@@ -7081,19 +6850,6 @@
 		)
 		(uuid "77a3d361-47a0-4b74-9b05-707429d9cf5a")
 	)
-<<<<<<< HEAD
-	(label "COL10"
-		(at 203.2 114.3 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right bottom)
-		)
-		(uuid "77a693a8-cbb0-4a16-9ffa-ff644b1ef66d")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "VSS"
 		(at 149.86 77.47 270)
 		(effects
@@ -7104,19 +6860,6 @@
 		)
 		(uuid "780166be-d300-4885-bbb9-b8b93658a286")
 	)
-<<<<<<< HEAD
-	(label "COL11"
-		(at 203.2 116.84 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right bottom)
-		)
-		(uuid "7ca58e08-c365-4691-8526-02e2f709f173")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "VSS"
 		(at 149.86 143.51 90)
 		(effects
@@ -7147,19 +6890,6 @@
 		)
 		(uuid "8348d23a-0a8c-4a80-a092-2c011e4ecf26")
 	)
-<<<<<<< HEAD
-	(label "COL13"
-		(at 203.2 121.92 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right bottom)
-		)
-		(uuid "861b9f69-5164-46d8-ad69-517a598a79a4")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "VSS"
 		(at 201.93 93.98 180)
 		(effects
@@ -7220,19 +6950,6 @@
 		)
 		(uuid "8bd4b99c-2cb7-4e42-a63a-d77ead0034b9")
 	)
-<<<<<<< HEAD
-	(label "COL2"
-		(at 162.56 76.2 270)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right bottom)
-		)
-		(uuid "8d5ea51c-3018-499a-9feb-77558fc69925")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "Place near USB port"
 		(at 92.71 50.8 0)
 		(effects
@@ -7253,22 +6970,14 @@
 		)
 		(uuid "92086348-c6ef-454f-890c-11a873ceb43a")
 	)
-<<<<<<< HEAD
-	(label "COL5"
-		(at 177.8 74.93 270)
-=======
 	(label "COL4"
 		(at 203.2 119.38 180)
->>>>>>> hardware-65percent
 		(effects
 			(font
 				(size 1.27 1.27)
 			)
 			(justify right bottom)
 		)
-<<<<<<< HEAD
-		(uuid "959bf094-985a-4d26-85c6-29f58b765d35")
-=======
 		(uuid "95fa2f23-8b81-47b7-bccb-9760f7b22390")
 	)
 	(label "COL9"
@@ -7280,7 +6989,6 @@
 			(justify right bottom)
 		)
 		(uuid "96ffef80-1b7b-4d2b-a1f7-1b8580e75eed")
->>>>>>> hardware-65percent
 	)
 	(label "Place Near VBAT"
 		(at 116.84 80.01 0)
@@ -7302,8 +7010,6 @@
 		)
 		(uuid "98066d23-6bbb-440b-b346-e60179dceea1")
 	)
-<<<<<<< HEAD
-=======
 	(label "COL15"
 		(at 160.02 76.2 270)
 		(effects
@@ -7334,7 +7040,6 @@
 		)
 		(uuid "a21ae7e0-711c-45a6-9e0f-0ffa2e2613b5")
 	)
->>>>>>> hardware-65percent
 	(label "UART_RX_WEST"
 		(at 212.09 106.68 180)
 		(effects
@@ -7385,8 +7090,6 @@
 		)
 		(uuid "ae8d8e37-f38f-41fe-903a-1eb9be3bd21d")
 	)
-<<<<<<< HEAD
-=======
 	(label "COL5"
 		(at 203.2 116.84 180)
 		(effects
@@ -7397,7 +7100,6 @@
 		)
 		(uuid "aecd807f-0dae-4de9-9f2a-7205af2df165")
 	)
->>>>>>> hardware-65percent
 	(label "JTMS"
 		(at 229.87 139.7 0)
 		(effects
@@ -7408,19 +7110,6 @@
 		)
 		(uuid "b1459e8f-23e1-418c-abf2-ccad8c3f1fe5")
 	)
-<<<<<<< HEAD
-	(label "UART_TX_SOUTH"
-		(at 123.19 129.54 0)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left bottom)
-		)
-		(uuid "b1ac5c45-29f6-49be-86d9-d334cdf2d7b7")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "COL6"
 		(at 245.11 26.67 270)
 		(effects
@@ -7431,19 +7120,6 @@
 		)
 		(uuid "b6dc15c4-5294-4338-988f-8c3f870110f4")
 	)
-<<<<<<< HEAD
-	(label "COL14"
-		(at 203.2 124.46 180)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right bottom)
-		)
-		(uuid "bb2ad147-d245-4431-84b9-4648d501513f")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "UART_TX_EAST"
 		(at 123.19 127 0)
 		(effects
@@ -7464,8 +7140,6 @@
 		)
 		(uuid "bf953326-f2e8-4e46-9ecf-e9fe4295b6b1")
 	)
-<<<<<<< HEAD
-=======
 	(label "COL8"
 		(at 203.2 109.22 180)
 		(effects
@@ -7476,7 +7150,6 @@
 		)
 		(uuid "c1c2ccbf-4c9e-486b-9a84-3f54fb5a6e01")
 	)
->>>>>>> hardware-65percent
 	(label "COL2"
 		(at 234.95 26.67 270)
 		(effects
@@ -7537,8 +7210,6 @@
 		)
 		(uuid "d312f0f4-cc79-473f-a2ed-836b5642b4a2")
 	)
-<<<<<<< HEAD
-=======
 	(label "COL1"
 		(at 203.2 127 180)
 		(effects
@@ -7549,7 +7220,6 @@
 		)
 		(uuid "d4e6b922-25eb-4849-9db9-6f6185ed1afd")
 	)
->>>>>>> hardware-65percent
 	(label "ROW4"
 		(at 209.55 55.88 0)
 		(effects
@@ -7580,8 +7250,6 @@
 		)
 		(uuid "dfbee201-609e-420a-8bd4-bc98bce299e1")
 	)
-<<<<<<< HEAD
-=======
 	(label "COL7"
 		(at 203.2 111.76 180)
 		(effects
@@ -7592,7 +7260,6 @@
 		)
 		(uuid "e443e11e-99a4-44c1-9116-18729e86e186")
 	)
->>>>>>> hardware-65percent
 	(label "VDD"
 		(at 201.93 91.44 180)
 		(effects
@@ -7603,19 +7270,6 @@
 		)
 		(uuid "e9b26d3d-3813-4e99-8ea8-af0648067087")
 	)
-<<<<<<< HEAD
-	(label "ROT_SW"
-		(at 154.94 147.32 90)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left bottom)
-		)
-		(uuid "ecce62bc-b4cc-48bb-a6e3-988ce1c4f4c4")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "UART_RX_SOUTH"
 		(at 53.34 92.71 0)
 		(effects
@@ -7626,19 +7280,6 @@
 		)
 		(uuid "ef17a05a-3c4b-4a77-a598-a5f8ad4599a9")
 	)
-<<<<<<< HEAD
-	(label "UART_RX_NORTH"
-		(at 172.72 63.5 270)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify right bottom)
-		)
-		(uuid "f0af64ee-d378-41f3-842f-24d5ad4f75d3")
-	)
-=======
->>>>>>> hardware-65percent
 	(label "COL8"
 		(at 250.19 26.67 270)
 		(effects
@@ -7649,19 +7290,6 @@
 		)
 		(uuid "f325fd11-511d-4af8-8e04-8af1e81ceee5")
 	)
-<<<<<<< HEAD
-	(label "ROT_TIMB"
-		(at 160.02 151.13 90)
-		(effects
-			(font
-				(size 1.27 1.27)
-			)
-			(justify left bottom)
-		)
-		(uuid "fe355360-6bef-43f4-a60d-7c9f0aed2700")
-	)
-=======
->>>>>>> hardware-65percent
 	(symbol
 		(lib_id "PCM_4ms_Power-symbol:GND")
 		(at 149.86 144.145 0)
@@ -12045,8 +11673,6 @@
 		)
 	)
 	(sheet
-<<<<<<< HEAD
-=======
 		(at 241.3 93.98)
 		(size 36.83 20.32)
 		(exclude_from_sim no)
@@ -12099,7 +11725,6 @@
 		)
 	)
 	(sheet
->>>>>>> hardware-65percent
 		(at 217.17 33.02)
 		(size 55.88 34.925)
 		(exclude_from_sim no)