diff --git a/keyboards/maxipad/config.h b/keyboards/maxipad/config.h
index a056e4963..4377a892e 100644
--- a/keyboards/maxipad/config.h
+++ b/keyboards/maxipad/config.h
@@ -32,6 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 6
 
+<<<<<<< HEAD
 // Planck PCB default pin-out
 // Change this to how you wired your keyboard
 // COLS: Left to right, ROWS: Top to bottom
@@ -44,6 +45,27 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	#define MATRIX_COL_PINS { F6, C6, D7, F5, B4, B5 }
 	#define UNUSED_PINS
  #endif
+=======
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+//Pro micro pinout
+	#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
+	#define MATRIX_COL_PINS { F4, C6, D7, F5, B4, B5 }
+	#define UNUSED_PINS
+//Teensy 2 pinout
+ 	//#define MATRIX_ROW_PINS { B6, F7, B2, B3, B1 }
+	//#define MATRIX_COL_PINS { F6, C6, D7, F5, B4, B5 }
+	//#define UNUSED_PINS
+
+>>>>>>> 102a830bbdb302eb0951ec7910ab7c9feae272d1
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/maxipad/readme.md b/keyboards/maxipad/readme.md
index 606bacd75..58ed5d718 100644
--- a/keyboards/maxipad/readme.md
+++ b/keyboards/maxipad/readme.md
@@ -5,47 +5,27 @@ Maxipad keyboard firmware
 ## Quantum MK Firmware
 
 For the full Quantum feature list, see [the parent readme.md](/readme.md).
-=======
-## Quantum MK Firmware
-
-For the full Quantum feature list, see [the parent readme](/).
-
->>>>>>> a06115df19a74d39b08758472b221e630c3680d3
-
-## Building
 
 If you are using a pro micro then make sure to enable USE_PRO_MICRO in the makefile
+Change the config.h pinout to match your mcu!!
 
 Download or clone the whole firmware and navigate to the keyboards/maxipad folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. 
 
 Depending on which keymap you would like to use, you will have to compile slightly differently.
 
 ### Default
-<<<<<<< HEAD
-To build with the default keymap, simply run `make default`.
-=======
 
 To build with the default keymap, simply run `make`.
 
->>>>>>> a06115df19a74d39b08758472b221e630c3680d3
 
 ### Other Keymaps
 Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `<name>.c` and see keymap document (you can find in top readme.md) and existent keymap files.
 
-<<<<<<< HEAD
-=======
-Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files.
 
->>>>>>> a06115df19a74d39b08758472b221e630c3680d3
 To build the firmware binary hex file with a keymap just do `make` with a keymap like this:
 
 ```
 $ make [default|jack|<name>]
 ```
-<<<<<<< HEAD
-Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
-=======
 
 Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
-
->>>>>>> a06115df19a74d39b08758472b221e630c3680d3
diff --git a/keyboards/maxipad/rules.mk b/keyboards/maxipad/rules.mk
index e6e5923f1..49bb5f002 100644
--- a/keyboards/maxipad/rules.mk
+++ b/keyboards/maxipad/rules.mk
@@ -59,10 +59,21 @@ EXTRAKEY_ENABLE ?= yes	# Audio control and System control(+450)
 CONSOLE_ENABLE ?= yes	# Console for debug(+400)
 COMMAND_ENABLE ?= yes    # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+<<<<<<< HEAD
 # SLEEP_LED_ENABLE ?= yes  # Breathing sleep LED during USB suspend
 # NKRO_ENABLE ?= yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 # BACKLIGHT_ENABLE ?= yes  # Enable keyboard backlight functionality
 # MIDI_ENABLE ?= YES 		# MIDI controls
 # UNICODE_ENABLE ?= YES 		# Unicode
 # BLUETOOTH_ENABLE ?= yes # Enable Bluetooth with the Adafruit EZ-Key HID
-USE_PRO_MICRO ?= yes
\ No newline at end of file
+USE_PRO_MICRO ?= yes
+=======
+SLEEP_LED_ENABLE ?= no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE ?= no            # USB Nkey Rollover
+BACKLIGHT_ENABLE ?= no       # Enable keyboard backlight functionality on B7 by default
+MIDI_ENABLE ?= no            # MIDI controls
+UNICODE_ENABLE ?= no         # Unicode
+BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE ?= no           # Audio output on port C6
+>>>>>>> 102a830bbdb302eb0951ec7910ab7c9feae272d1