add last_action information of bills
fix conflict