Change db_merge back to db_update