I wonder what would happen if you brought them both into the office and, as light-heartedly as possible, and absolutely refusing to rehash the reasons for the tensions, told them to shake hands and stop being silly.

Humor would be essential here.

Perhaps y... Login to read more.