diff --git a/functions/ibase.xml b/functions/ibase.xml
index 79546034c6..d5113584ee 100644
--- a/functions/ibase.xml
+++ b/functions/ibase.xml
@@ -41,7 +41,6 @@ ibase_close($dbh);
 	<para>
 	See also: <function>ibase_pconnect</function>.
 	</para>
-=======
      <paramdef>string <parameter>database</parameter></paramdef>
      <paramdef>string <parameter><optional>username</optional></parameter></paramdef>
      <paramdef>string <parameter><optional>password</optional></parameter></paramdef>
@@ -52,7 +51,6 @@ ibase_close($dbh);
     <para>
      See also: <function>ibase_pconnect</function>.
     </para>
->>>>>>> 1.5
    </refsect1>
   </refentry>