merge conflicts resolved V0_9__CREATE_CBD_DB.sql