merge mockup and database