conflict management

Do you ever get the feeling that some conflict just can't be solved? The team members in conflict address the issue, it seems to go away but then it comes back. Maybe all dressed up in a new situation or with a different level of intensity, but the conflict is somehow familiar and you know that it has undoubtedly returned. If the team uses humor as a stress-reliever, you may even hear the conflict turned into a sarcastic half-joke, "OK team, just to put you on notice. Julie hates me again." Sounds almost like a marriage, doesn't it?