Just dont bring it up, until you get the weed.

If he brings it up, politely tell him something that isnt a lie, or just tell him that you will talk about that later, and you want to take care of the weed stuff right now.