fix database addition and change
merge