You’ll soon have an opportunity to make peace with an estranged colleague. Do it, because you’ve been working at cross-purposes for too long.