diff --git a/post/cpu/ppc4xx/uart.c b/post/cpu/ppc4xx/uart.c
index 5f14967..7c3ed40 100644
--- a/post/cpu/ppc4xx/uart.c
+++ b/post/cpu/ppc4xx/uart.c
@@ -137,7 +137,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-<<<<<<< master
+#if defined(CONFIG_440)
 #if !defined(CFG_EXT_SERIAL_CLOCK)
 static void serial_divs (int baudrate, unsigned long *pudiv,
 			 unsigned short *pbdiv)
@@ -181,9 +181,6 @@
 }
 #endif
 
-=======
-#if defined(CONFIG_440)
->>>>>>> zeus
 static int uart_post_init (unsigned long dev_base)
 {
 	unsigned long reg;