recreated database to fix conflict issues