db & modals merge