diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 7d6ff9a7f665..073540e1afd5 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -43,13 +43,6 @@ OPTIONS=	ISISD		"Enable experimental ISIS daemon"	off \
 
 .include <bsd.port.pre.mk>
 
-<<<<<<< Makefile
-.if ${OSVERSION} >= 800059
-#BROKEN=		does not build
-.endif
-
-=======
->>>>>>> 1.80
 CONFIGURE_ARGS+=--includedir=${PREFIX}/include --enable-exampledir=${PREFIX}/share/examples/quagga --enable-pidfile-mask=0644
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \