diff --git a/app/boards/shields/leeloo/leeloo_left.overlay b/app/boards/shields/leeloo/leeloo_left.overlay
index ba7b9bc1..35cd05ab 100644
--- a/app/boards/shields/leeloo/leeloo_left.overlay
+++ b/app/boards/shields/leeloo/leeloo_left.overlay
@@ -6,21 +6,16 @@
 #include "leeloo.dtsi"
 
 &kscan0 {
-    col-gpios
-        = <&pro_micro 19 GPIO_ACTIVE_HIGH>
-        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
-        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
-        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
-        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
-        , <&pro_micro 10 GPIO_ACTIVE_HIGH>
-        ;
+	col-gpios
+		= <&pro_micro 19 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 10 GPIO_ACTIVE_HIGH>
+		;
 };
 
 &left_encoder {
-<<<<<<< HEAD
-    status = "okay";
-};
-=======
 	status = "okay";
 };
->>>>>>> 69308eaf (Leeloo v2 and Leeloo v1 updates to support Zephyr 3.2)