db and api ready to merge