diff --git a/core/arch/arm/plat-nuvoton/main.c b/core/arch/arm/plat-nuvoton/main.c
index 86da00cdf51..70b2edd552f 100644
--- a/core/arch/arm/plat-nuvoton/main.c
+++ b/core/arch/arm/plat-nuvoton/main.c
@@ -29,7 +29,11 @@
 #define NPCM_MEASURE_DME	0x0E0
 #define NPCM_MEASURE_SIZE	64
 
+<<<<<<< HEAD
 static struct pl011_data console_data __nex_bss;
+=======
+static struct ns16550_data console_data __nex_bss;
+>>>>>>> a48e9fe94 (plat-nuvoton: added HUK reading)
 
 register_phys_mem_pgdir(MEM_AREA_IO_SEC, CONSOLE_UART_BASE, UART_REG_SIZE);
 register_phys_mem_pgdir(MEM_AREA_IO_SEC, GICD_BASE, GIC_DIST_REG_SIZE);