diff --git a/reference/paradox/functions/px-set-targetencoding.xml b/reference/paradox/functions/px-set-targetencoding.xml
index 30fab5ad66..f3fb32e525 100644
--- a/reference/paradox/functions/px-set-targetencoding.xml
+++ b/reference/paradox/functions/px-set-targetencoding.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/paradox.xml, last change in rev  -->
 <refentry id="function.px-set-targetencoding">
  <refnamediv>
@@ -23,12 +23,8 @@
    iconv or recode.
   </para>
   <para>This function is deprecated and should be replaced by calling
-<<<<<<< px-set-targetencoding.xml
-   <function>px_set_parameter</function>.</para>
-=======
    <function>px_set_parameter</function>.
   </para>
->>>>>>> 1.4
   <para>
    See also <function>px_get_info</function> to determine the DOS code page
    as stored in the database file.