That is a conflict. A half confrontational mostly passive aggressive one. The diplomatic way to go about it:
— see if they’re in the mood to chat, take turns talking about what upset you both and acknowledge it or apologize sincerely. Keep it like a calm convo if you can and ideally you both should have the goal of wanting your friendship to w......
