merge conflict initDB