I hardly think that office disagreements are the sort of thing the advice is meant to deal with.

Also, be careful with taking your own advice on this one. If you keep working with someone personally instead of formally, you're giving him/her the chance to manipulate a situation against you.