merge activity from cdep and senate
scrape all activity and merge it
fix tests