How to Resolve Office Conflict

We don’t like everyone we work with all the time. What is a tactful way (especially on a small team) to address a conflict with a colleague before it gets out of hand? The following answers are ...