merge database changes