diff --git a/boards/jpconstantineau/PyKey60/README.md b/boards/jpconstantineau/PyKey60/README.md
index 55b6a2c..74afb65 100644
--- a/boards/jpconstantineau/PyKey60/README.md
+++ b/boards/jpconstantineau/PyKey60/README.md
@@ -7,11 +7,7 @@ A 60% RGB Keyboard PCB with Hot Swap Sockets, running CircuitPython on a RP2040
 kb.py is designed to work with the [PyKey60 CircuitPython UF2](https://circuitpython.org/board/jpconstantineau_pykey60/)
 
 Retailers (USA)  
-<<<<<<< HEAD
 [BlueMicro Store on Tindie](https://www.tindie.com/products/jpconstantineau/pykey60-rgb-keyboard-pcb-with-a-rp2040/)  
-=======
-[BlueMicro Store on Tindie](hhttps://www.tindie.com/products/jpconstantineau/pykey60-rgb-keyboard-pcb-with-a-rp2040/)  
->>>>>>> 9e830a1 (adding jpconstantineau's boards)
 
 Extensions enabled by default  
 - [Layers](https://github.com/KMKfw/kmk_firmware/tree/master/docs/layers.md) Need more keys than switches? Use layers.
diff --git a/boards/jpconstantineau/PyKey60/kb.py b/boards/jpconstantineau/PyKey60/kb.py
index c9fb70c..4945a45 100644
--- a/boards/jpconstantineau/PyKey60/kb.py
+++ b/boards/jpconstantineau/PyKey60/kb.py
@@ -5,11 +5,7 @@ from kmk.matrix import DiodeOrientation
 
 
 class KMKKeyboard(_KMKKeyboard):
-<<<<<<< HEAD
     col_pins = (
-=======
-    row_pins = (
->>>>>>> 9e830a1 (adding jpconstantineau's boards)
         board.COL1,
         board.COL2,
         board.COL3,
@@ -25,11 +21,7 @@ class KMKKeyboard(_KMKKeyboard):
         board.COL13,
         board.COL14,
     )
-<<<<<<< HEAD
     row_pins = (board.ROW1, board.ROW2, board.ROW3, board.ROW4, board.ROW5)
-=======
-    col_pins = (board.ROW1, board.ROW2, board.ROW3, board.ROW4, board.ROW5)
->>>>>>> 9e830a1 (adding jpconstantineau's boards)
     diode_orientation = DiodeOrientation.COL2ROW
     rgb_pixel_pin = board.NEOPIXEL
     rgb_num_pixels = 61
diff --git a/boards/jpconstantineau/vcolchoc44/README.md b/boards/jpconstantineau/vcolchoc44/README.md
index 188a505..d722cc1 100644
--- a/boards/jpconstantineau/vcolchoc44/README.md
+++ b/boards/jpconstantineau/vcolchoc44/README.md
@@ -1,10 +1,6 @@
 # JPConstantineau's VColChoc44: A Low Profile Atreus44 clone
 
-<<<<<<< HEAD
 ![VColChoc44](https://cdn.tindiemedia.com/images/resize/tbqfM8nhMn0hoDM0ZkwYxM23mU0=/p/full-fit-in/2400x1600/i/556481/products/2021-10-15T15%3A33%3A13.288Z-qj04uaoo2ht71.jpg?1634287023)
-=======
-![Atreus44](https://cdn.tindiemedia.com/images/resize/tbqfM8nhMn0hoDM0ZkwYxM23mU0=/p/full-fit-in/2400x1600/i/556481/products/2021-10-15T15%3A33%3A13.288Z-qj04uaoo2ht71.jpg?1634287023)
->>>>>>> 9e830a1 (adding jpconstantineau's boards)
 
 44 Keys Low Profile RGB Keyboard inspired from Keyboardio's Atreus with a RP2040 Soldered on board.
 
diff --git a/boards/jpconstantineau/vcolchoc44/kb.py b/boards/jpconstantineau/vcolchoc44/kb.py
index ea55148..0f305bc 100644
--- a/boards/jpconstantineau/vcolchoc44/kb.py
+++ b/boards/jpconstantineau/vcolchoc44/kb.py
@@ -5,11 +5,7 @@ from kmk.matrix import DiodeOrientation
 
 
 class KMKKeyboard(_KMKKeyboard):
-<<<<<<< HEAD
     col_pins = (
-=======
-    row_pins = (
->>>>>>> 9e830a1 (adding jpconstantineau's boards)
         board.COL1,
         board.COL2,
         board.COL3,
@@ -22,11 +18,7 @@ class KMKKeyboard(_KMKKeyboard):
         board.COL10,
         board.COL11,
     )
-<<<<<<< HEAD
     row_pins = (board.ROW1, board.ROW2, board.ROW3, board.ROW4)
-=======
-    col_pins = (board.ROW1, board.ROW2, board.ROW3, board.ROW4)
->>>>>>> 9e830a1 (adding jpconstantineau's boards)
     diode_orientation = DiodeOrientation.COL2ROW
     rgb_pixel_pin = board.NEOPIXEL
     rgb_num_pixels = 44
diff --git a/boards/jpconstantineau/vcolmx44/README.md b/boards/jpconstantineau/vcolmx44/README.md
index 6d63e04..79185b5 100644
--- a/boards/jpconstantineau/vcolmx44/README.md
+++ b/boards/jpconstantineau/vcolmx44/README.md
@@ -1,23 +1,14 @@
 # JPConstantineau's VColMX44: An Atreus44 clone
 
-<<<<<<< HEAD
 ![VColMX44](https://cdn.tindiemedia.com/images/resize/5oEyXgxteB6wYjXv8kFC1B3YqOk=/p/full-fit-in/2400x1600/i/556481/products/2021-10-20T05%3A14%3A24.776Z-PXL_20211016_060203733.jpg?1634681706v)
 
-=======
-![Atreus44](https://cdn.tindiemedia.com/images/resize/tbqfM8nhMn0hoDM0ZkwYxM23mU0=/p/full-fit-in/2400x1600/i/556481/products/2021-10-15T15%3A33%3A13.288Z-qj04uaoo2ht71.jpg?1634287023)
-Image to be updated.
->>>>>>> 9e830a1 (adding jpconstantineau's boards)
 
 44 Keys RGB Keyboard inspired from Keyboardio's Atreus with a Raspberry Pi Pico
 
 kb.py is designed to work with the [Pico CircuitPython UF2](https://circuitpython.org/board/raspberry_pi_pico/)
 
 Retailers (USA)  
-<<<<<<< HEAD
 [BlueMicro Store on Tindie](https://www.tindie.com/products/jpconstantineau/raspberry-pi-pico-44-keys-rgb-keyboard/)
-=======
-[BlueMicro Store on Tindie](https://www.tindie.com/products/jpconstantineau/low-profile-44-keys-rgb-keyboard-pcb-with-a-rp2040/)  Link to be updated
->>>>>>> 9e830a1 (adding jpconstantineau's boards)
 
 Extensions enabled by default  
 - [Layers](https://github.com/KMKfw/kmk_firmware/tree/master/docs/layers.md) Need more keys than switches? Use layers.
diff --git a/boards/jpconstantineau/vcolmx44/kb.py b/boards/jpconstantineau/vcolmx44/kb.py
index 86061cc..c1db715 100644
--- a/boards/jpconstantineau/vcolmx44/kb.py
+++ b/boards/jpconstantineau/vcolmx44/kb.py
@@ -5,11 +5,7 @@ from kmk.matrix import DiodeOrientation
 
 
 class KMKKeyboard(_KMKKeyboard):
-<<<<<<< HEAD
     col_pins = (
-=======
-    row_pins = (
->>>>>>> 9e830a1 (adding jpconstantineau's boards)
         board.GP20,
         board.GP19,
         board.GP18,
@@ -22,11 +18,7 @@ class KMKKeyboard(_KMKKeyboard):
         board.GP1,
         board.GP0,
     )
-<<<<<<< HEAD
     row_pins = (board.GP22, board.GP21, board.GP14, board.GP15)
-=======
-    col_pins = (board.GP22, board.GP21, board.GP14, board.GP15)
->>>>>>> 9e830a1 (adding jpconstantineau's boards)
     diode_orientation = DiodeOrientation.COL2ROW
     rgb_pixel_pin = board.GP28
     rgb_num_pixels = 44