You also are putting too much thought into it. Focus on the event and not on the conflict. If the topic comes up, very clearly state that you do not wish to engage in conversation about that subject at this time and that you respectfully request that he do the same. :)