Whenever conflict arises at work, I usually just take a pause and buy the other person a drink and get to know each other on a more personal level. Its fun doing this and usually it ends up with me understanding my coworker on a more human level and we come to an agreement and work better together. A few years ago I would have fought to have my way and as satisfying as it was to win (occasionally), the attitude is very divisive and alienating for both parties involved.