Revised marijuana bill could erase 300,000 criminal convictions