Make nice. This won’t really change things between you and a rival at work, but you’re better together than you are apart.