diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
index 8858b5a5ae40..93f2998b8610 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
@@ -322,7 +322,6 @@
 	cpu-supply = <&vdd_cpu>;
 };
 
-<<<<<<< HEAD
 &ebc {
 	io-channels = <&ebc_pmic 0>;
 	panel-supply = <&v3p3>;