diff --git a/lib/isc/win32/include/isc/ntpaths.h b/lib/isc/win32/include/isc/ntpaths.h
index a91b1b6bc2..25db8925f5 100644
--- a/lib/isc/win32/include/isc/ntpaths.h
+++ b/lib/isc/win32/include/isc/ntpaths.h
@@ -15,11 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-<<<<<<< ntpaths.h
-/* $Id: ntpaths.h,v 1.7 2001/07/27 05:15:27 mayer Exp $ */
-=======
-/* $Id: ntpaths.h,v 1.7 2001/07/27 05:15:27 mayer Exp $ */
->>>>>>> 1.6
+/* $Id: ntpaths.h,v 1.8 2001/07/27 05:16:55 mayer Exp $ */
 
 /*
  * Windows-specific path definitions