diff --git a/app/boards/arm/preonic/preonic_rev3_defconfig b/app/boards/arm/preonic/preonic_rev3_defconfig
index 7a21ad5f..b6c88b51 100644
--- a/app/boards/arm/preonic/preonic_rev3_defconfig
+++ b/app/boards/arm/preonic/preonic_rev3_defconfig
@@ -26,4 +26,7 @@ CONFIG_CLOCK_STM32_PLL_MULTIPLIER=9
 CONFIG_CLOCK_STM32_AHB_PRESCALER=1
 CONFIG_CLOCK_STM32_APB1_PRESCALER=2
 CONFIG_CLOCK_STM32_APB2_PRESCALER=1
+<<<<<<< HEAD
 CONFIG_ZMK_KSCAN_MATRIX_POLLING=y
+=======
+>>>>>>> aad447758e88ce839bdbd8f94259d1402ab1c8e1