diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 22b9143d3a..1f4fbed78c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-07 04:22 UTC+0600 April White (april users.sourceforge.net)
+  * harbour/doc/inet.txt
+    * intentionally removed DOC header/footer so that hbdoc/hbdoc2 ignore this file
+    * please see en-EN/hbinet.txt which now replaces this file
+  * harbour/examples/hbdoc2/hbdoc2.prg
+    * removed 'merge' lines mistakenly left in
+
 2009-11-07 03:14 UTC+0600 April White (april users.sourceforge.net)
   + harbour/doc/en-EN/hbinet.txt
     + initial version, based on harbour/inet.txt and source files
diff --git a/harbour/doc/inet.txt b/harbour/doc/inet.txt
index 468215aa76..2faf4c0cb6 100644
--- a/harbour/doc/inet.txt
+++ b/harbour/doc/inet.txt
@@ -8,7 +8,10 @@
 
         Giancarlo Niccolai <gian@niccolai.ws>
 
-/*  $DOC$
+intentially removed DOC header/footer so that hbdoc/hbdoc2 ignore this file
+
+please see en-EN/hbinet.txt which now replaces this file
+
  *  $TEMPLATE$
  *     Document
  *  $NAME$
@@ -341,5 +344,4 @@
  *        just return the last complete datagram that has been received, up
  *        to nSize bytes.
  *        Returns -1 on error, or the number of bytes actually read on success.
- *  $END$
  */
diff --git a/harbour/examples/hbdoc2/hbdoc2.prg b/harbour/examples/hbdoc2/hbdoc2.prg
index e12db16c5e..e3b3ee2a9b 100644
--- a/harbour/examples/hbdoc2/hbdoc2.prg
+++ b/harbour/examples/hbdoc2/hbdoc2.prg
@@ -896,13 +896,11 @@ FUNCTION Decode( cType, hsBlock, cKey )
          RETURN SubStr( cResult, LEN( HB_OSNewLine() ) + 1 )
       ENDIF
 
-<<<<<<< .mine
       IF ( idx := HB_AScan( p_aCompliance, {|a| a[1] == cCode } ) ) > 0
          RETURN p_aCompliance[ idx ][ 2 ]
       ELSE
          RETURN "Unknown 'COMPLIANCE' code: '" + cCode + "'"
       ENDIF
-=======
       DO CASE
       CASE Empty( cCode ) ;      RETURN cCode
       CASE cCode == "C" ;        RETURN "This is CA-Cl*pper v5.2 compliant"
@@ -917,7 +915,6 @@ FUNCTION Decode( cType, hsBlock, cKey )
       CASE cCode == "XPP" ;      RETURN "This an Xbase++ compatibility function and is only visible if source was compiled with the HB_COMPAT_XPP flag"
       OTHERWISE ;                RETURN "Unknown 'COMPLIANCE' code: '" + cCode + "'"
       ENDCASE
->>>>>>> .r12826
 
    CASE cType == "NAME"
       IF hsBlock == NIL