merge and stuff, readding connect-flash
revert db