diff --git a/boards/jpconstantineau/Batreus44/kb.py b/boards/jpconstantineau/Batreus44/kb.py
deleted file mode 100644
index ac8296c..0000000
--- a/boards/jpconstantineau/Batreus44/kb.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import board
-
-from kmk.kmk_keyboard import KMKKeyboard as _KMKKeyboard
-from kmk.matrix import DiodeOrientation
-
-
-class KMKKeyboard(_KMKKeyboard):
-    col_pins = (
-                board.P0_15, board.P0_17, board.P0_20, board.P0_13,  board.P0_24,
-                board.P0_09, board.P0_03, board.P1_13,  board.P0_02, board.P0_29, board.P0_26,  board.P0_30
-    )
-    row_pins = (board.P0_28, board.P1_11, board.P0_10, board.P1_06)
-    diode_orientation = DiodeOrientation.COL2ROW
-
diff --git a/boards/jpconstantineau/Batreus44/kb_BlueMicro840.py b/boards/jpconstantineau/Batreus44/kb_BlueMicro840.py
index d598454..591b8b1 100644
--- a/boards/jpconstantineau/Batreus44/kb_BlueMicro840.py
+++ b/boards/jpconstantineau/Batreus44/kb_BlueMicro840.py
@@ -6,6 +6,7 @@ from kmk.matrix import DiodeOrientation
 
 class KMKKeyboard(_KMKKeyboard):
     col_pins = (
+<<<<<<< HEAD
         board.P0_15,
         board.P0_17,
         board.P0_20,
@@ -21,3 +22,11 @@ class KMKKeyboard(_KMKKeyboard):
     )
     row_pins = (board.P0_28, board.P1_11, board.P0_10, board.P1_06)
     diode_orientation = DiodeOrientation.COL2ROW
+=======
+                board.P0_15, board.P0_17, board.P0_20, board.P0_13,  board.P0_24,
+                board.P0_09, board.P0_03, board.P1_13,  board.P0_02, board.P0_29, board.P0_26,  board.P0_30
+    )
+    row_pins = (board.P0_28, board.P1_11, board.P0_10, board.P1_06)
+    diode_orientation = DiodeOrientation.COL2ROW
+
+>>>>>>> d870865 (minor updates/comments)