database changes ammerged
db changes