When it comes to conflict and arguments, the last thing anyone wants is for tempers to flare — though they too often do. In most cases, diversion is the key to creating a calm situation. Regardless of how things escalated, ending on a peaceful note can save face and possibly a relationship. One way to do this? Comic relief. Here are some tips on managing conflict with good humor. Pull Out Your Playful...