diff --git a/firmware/hbb.cfg b/firmware/hbb.cfg
index 29d5095..c9a335f 100644
--- a/firmware/hbb.cfg
+++ b/firmware/hbb.cfg
@@ -54,6 +54,7 @@ CONFIG_USB_SERIAL_NUMBER="12345"
 #
 # end of USB ids
 
+<<<<<<< HEAD
 CONFIG_WANT_ADC=y
 CONFIG_WANT_SPI=y
 CONFIG_WANT_SOFTWARE_SPI=y
@@ -66,15 +67,28 @@ CONFIG_WANT_NEOPIXEL=y
 CONFIG_WANT_PULSE_COUNTER=y
 CONFIG_WANT_ST7920=y
 CONFIG_WANT_HD44780=y
+=======
+CONFIG_WANT_GPIO_BITBANGING=y
+CONFIG_WANT_DISPLAYS=y
+CONFIG_WANT_THERMOCOUPLE=y
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_WANT_ADXL345=y
 CONFIG_WANT_LIS2DW=y
 CONFIG_WANT_MPU9250=y
 CONFIG_WANT_ICM20948=y
+<<<<<<< HEAD
 CONFIG_WANT_THERMOCOUPLE=y
+=======
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_WANT_HX71X=y
 CONFIG_WANT_ADS1220=y
 CONFIG_WANT_LDC1612=y
 CONFIG_WANT_SENSOR_ANGLE=y
+<<<<<<< HEAD
+=======
+CONFIG_WANT_SOFTWARE_I2C=y
+CONFIG_WANT_SOFTWARE_SPI=y
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_NEED_SENSOR_BULK=y
 CONFIG_CANBUS_FREQUENCY=1000000
 CONFIG_INLINE_STEPPER_HACK=y
@@ -89,4 +103,7 @@ CONFIG_HAVE_GPIO_HARD_PWM=y
 CONFIG_HAVE_STRICT_TIMING=y
 CONFIG_HAVE_CHIPID=y
 CONFIG_HAVE_BOOTLOADER_REQUEST=y
+<<<<<<< HEAD
 CONFIG_HAVE_SOFTWARE_DIVIDE_REQUIRED=y
+=======
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
diff --git a/firmware/hbb.cfg.old b/firmware/hbb.cfg.old
index 73a1e2b..0565dcc 100644
--- a/firmware/hbb.cfg.old
+++ b/firmware/hbb.cfg.old
@@ -1,15 +1,25 @@
+<<<<<<< HEAD
 CONFIG_LOW_LEVEL_OPTIONS=y
 # CONFIG_MACH_AVR is not set
+=======
+# CONFIG_LOW_LEVEL_OPTIONS is not set
+CONFIG_MACH_AVR=y
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 # CONFIG_MACH_ATSAM is not set
 # CONFIG_MACH_ATSAMD is not set
 # CONFIG_MACH_LPC176X is not set
 # CONFIG_MACH_STM32 is not set
 # CONFIG_MACH_HC32F460 is not set
+<<<<<<< HEAD
 CONFIG_MACH_RPXXXX=y
+=======
+# CONFIG_MACH_RPXXXX is not set
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 # CONFIG_MACH_PRU is not set
 # CONFIG_MACH_AR100 is not set
 # CONFIG_MACH_LINUX is not set
 # CONFIG_MACH_SIMU is not set
+<<<<<<< HEAD
 CONFIG_BOARD_DIRECTORY="rp2040"
 CONFIG_MCU="rp2040"
 CONFIG_CLOCK_FREQ=12000000
@@ -54,6 +64,33 @@ CONFIG_USB_SERIAL_NUMBER="12345"
 #
 # end of USB ids
 
+=======
+CONFIG_AVR_SELECT=y
+CONFIG_BOARD_DIRECTORY="avr"
+CONFIG_MACH_atmega2560=y
+# CONFIG_MACH_atmega1280 is not set
+# CONFIG_MACH_at90usb1286 is not set
+# CONFIG_MACH_at90usb646 is not set
+# CONFIG_MACH_atmega32u4 is not set
+# CONFIG_MACH_atmega1284p is not set
+# CONFIG_MACH_atmega644p is not set
+# CONFIG_MACH_atmega328p is not set
+# CONFIG_MACH_atmega328 is not set
+# CONFIG_MACH_atmega168 is not set
+CONFIG_MCU="atmega2560"
+CONFIG_AVRDUDE_PROTOCOL="wiring"
+CONFIG_CLOCK_FREQ=16000000
+CONFIG_AVR_CLKPR=-1
+CONFIG_AVR_STACK_SIZE=256
+CONFIG_AVR_WATCHDOG=y
+CONFIG_SERIAL=y
+CONFIG_SERIAL_BAUD_U2X=y
+CONFIG_SERIAL_PORT=0
+CONFIG_SERIAL_BAUD=250000
+CONFIG_USB_VENDOR_ID=0x1d50
+CONFIG_USB_DEVICE_ID=0x614e
+CONFIG_USB_SERIAL_NUMBER="12345"
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_WANT_GPIO_BITBANGING=y
 CONFIG_WANT_DISPLAYS=y
 CONFIG_WANT_THERMOCOUPLE=y
@@ -70,14 +107,20 @@ CONFIG_WANT_SOFTWARE_SPI=y
 CONFIG_NEED_SENSOR_BULK=y
 CONFIG_CANBUS_FREQUENCY=1000000
 CONFIG_INLINE_STEPPER_HACK=y
+<<<<<<< HEAD
 CONFIG_HAVE_STEPPER_OPTIMIZED_BOTH_EDGE=y
 CONFIG_WANT_STEPPER_OPTIMIZED_BOTH_EDGE=y
 CONFIG_INITIAL_PINS=""
+=======
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_HAVE_GPIO=y
 CONFIG_HAVE_GPIO_ADC=y
 CONFIG_HAVE_GPIO_SPI=y
 CONFIG_HAVE_GPIO_I2C=y
 CONFIG_HAVE_GPIO_HARD_PWM=y
 CONFIG_HAVE_STRICT_TIMING=y
+<<<<<<< HEAD
 CONFIG_HAVE_CHIPID=y
 CONFIG_HAVE_BOOTLOADER_REQUEST=y
+=======
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
diff --git a/firmware/octopus-pro.config b/firmware/octopus-pro.config
index f4f8606..4d3f6d4 100644
--- a/firmware/octopus-pro.config
+++ b/firmware/octopus-pro.config
@@ -96,6 +96,7 @@ CONFIG_USB_SERIAL_NUMBER="12345"
 #
 # end of USB ids
 
+<<<<<<< HEAD
 CONFIG_WANT_ADC=y
 CONFIG_WANT_SPI=y
 CONFIG_WANT_SOFTWARE_SPI=y
@@ -108,19 +109,37 @@ CONFIG_WANT_NEOPIXEL=y
 CONFIG_WANT_PULSE_COUNTER=y
 CONFIG_WANT_ST7920=y
 CONFIG_WANT_HD44780=y
+=======
+CONFIG_WANT_GPIO_BITBANGING=y
+CONFIG_WANT_DISPLAYS=y
+CONFIG_WANT_THERMOCOUPLE=y
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_WANT_ADXL345=y
 CONFIG_WANT_LIS2DW=y
 CONFIG_WANT_MPU9250=y
 CONFIG_WANT_ICM20948=y
+<<<<<<< HEAD
 CONFIG_WANT_THERMOCOUPLE=y
+=======
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_WANT_HX71X=y
 CONFIG_WANT_ADS1220=y
 CONFIG_WANT_LDC1612=y
 CONFIG_WANT_SENSOR_ANGLE=y
+<<<<<<< HEAD
+=======
+CONFIG_WANT_SOFTWARE_I2C=y
+CONFIG_WANT_SOFTWARE_SPI=y
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_NEED_SENSOR_BULK=y
 CONFIG_CANBUS=y
 CONFIG_CANBUS_FREQUENCY=1000000
 CONFIG_INLINE_STEPPER_HACK=y
+<<<<<<< HEAD
+=======
+CONFIG_HAVE_STEPPER_OPTIMIZED_BOTH_EDGE=y
+CONFIG_WANT_STEPPER_OPTIMIZED_BOTH_EDGE=y
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_INITIAL_PINS="PE11"
 CONFIG_HAVE_GPIO=y
 CONFIG_HAVE_GPIO_ADC=y
diff --git a/firmware/rp_sb2209.CAN b/firmware/rp_sb2209.CAN
index c29d862..8aa58f8 100644
--- a/firmware/rp_sb2209.CAN
+++ b/firmware/rp_sb2209.CAN
@@ -43,6 +43,7 @@ CONFIG_RPXXXX_CANBUS_GPIO_TX=5
 CONFIG_USB_VENDOR_ID=0x1d50
 CONFIG_USB_DEVICE_ID=0x614e
 CONFIG_USB_SERIAL_NUMBER="12345"
+<<<<<<< HEAD
 CONFIG_WANT_ADC=y
 CONFIG_WANT_SPI=y
 CONFIG_WANT_SOFTWARE_SPI=y
@@ -55,15 +56,28 @@ CONFIG_WANT_NEOPIXEL=y
 CONFIG_WANT_PULSE_COUNTER=y
 CONFIG_WANT_ST7920=y
 CONFIG_WANT_HD44780=y
+=======
+CONFIG_WANT_GPIO_BITBANGING=y
+CONFIG_WANT_DISPLAYS=y
+CONFIG_WANT_THERMOCOUPLE=y
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_WANT_ADXL345=y
 CONFIG_WANT_LIS2DW=y
 CONFIG_WANT_MPU9250=y
 CONFIG_WANT_ICM20948=y
+<<<<<<< HEAD
 CONFIG_WANT_THERMOCOUPLE=y
+=======
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_WANT_HX71X=y
 CONFIG_WANT_ADS1220=y
 CONFIG_WANT_LDC1612=y
 CONFIG_WANT_SENSOR_ANGLE=y
+<<<<<<< HEAD
+=======
+CONFIG_WANT_SOFTWARE_I2C=y
+CONFIG_WANT_SOFTWARE_SPI=y
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_NEED_SENSOR_BULK=y
 CONFIG_CANSERIAL=y
 CONFIG_CANBUS=y
@@ -81,4 +95,7 @@ CONFIG_HAVE_GPIO_HARD_PWM=y
 CONFIG_HAVE_STRICT_TIMING=y
 CONFIG_HAVE_CHIPID=y
 CONFIG_HAVE_BOOTLOADER_REQUEST=y
+<<<<<<< HEAD
 CONFIG_HAVE_SOFTWARE_DIVIDE_REQUIRED=y
+=======
+>>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9