I have merged the database now