diff --git a/ldap/servers/slapd/back-ldbm/db-bdb/bdb_bdbreader_glue.c b/ldap/servers/slapd/back-ldbm/db-bdb/bdb_bdbreader_glue.c
index 539bb9d73..77cb1570e 100644
--- a/ldap/servers/slapd/back-ldbm/db-bdb/bdb_bdbreader_glue.c
+++ b/ldap/servers/slapd/back-ldbm/db-bdb/bdb_bdbreader_glue.c
@@ -9,8 +9,6 @@
 #include "bdb_layer.h"
 #include <robdb.h>
 
-#define DEBUG 1
-
 /*
  * This file contains the stub that transform usual bdb API (limited to the function 389-ds needs to export a db and a changelog
  * to  bdb_ro callbacks
@@ -248,7 +246,7 @@ int db_close(DB *db, u_int32_t flags)
 
 int dbc_close(DBC *dbc)
 {
-     bdbreader_bdb_close(dbc->impl);
+     bdbreader_cur_close(dbc->impl);
      dbc->impl = NULL;
      slapi_ch_free((void **)&dbc);
      return DB_SUCCESS;
diff --git a/ldap/servers/slapd/back-ldbm/dbimpl.c b/ldap/servers/slapd/back-ldbm/dbimpl.c
index 487dc44d1..f00779c3c 100644
--- a/ldap/servers/slapd/back-ldbm/dbimpl.c
+++ b/ldap/servers/slapd/back-ldbm/dbimpl.c
@@ -397,7 +397,6 @@ const char *dblayer_op2str(dbi_op_t op)
     return str[idx];
 }
 
-<<<<<<< HEAD
 /* Get the li_directory directory from the database instance name -
  * Caller should free the returned value
  */
@@ -440,8 +439,6 @@ get_li_directory(const char *fname)
 }
 
 /* Open db env, db and db file privately (for dbscan) */
-=======
-/* Open db env, db and db file privately (used by dbscan) */
 int dblayer_private_open(const char *plgname, const char *dbfilename, int rw, Slapi_Backend **be, dbi_env_t **env, dbi_db_t **db)
 {
     struct ldbminfo *li;