President Trump said Friday that he “probably” will support new legislation allowing states to set their own marijuana policies, making good on assurances he gave Sen. Cory Gardner, R-Colo., this year.

The bill sponsored by Gardner would federally legalize marijuana in states that allows its use, ending a long-standing conflict between state and federal law, which still deems almost all possession of the drug illegal.