Merge database changes