This paper explores humor as a conversational resource for mitigating interactional conflict. It analyzes the organizational structure and dynamics of conflict talk, investigates different types of humor and their impact on conflict sequences, and shows that the conflict mitigating efficiency of humor depends on a range of factors: how grave the conflict is; the social power relationship between the participants; who initiates the humor; the type of humor and participants' reactions.