My grandfather once said that if a person had trouble getting along with a co-worker, to let the air out of the person's car tires. Then after work, hang around a little longer and help the person get a ride home, or air up the tires.

I'm not sure if he was joking about the first part, but I have found it's a good to offer favors when there's tension, or to help someone out of a jam.