progress before merging db code