Office Skirmish: How to Avoid Round 2

This is an interesting article from the NY Times.  Click on the link to get advice.

You recently had a big argument with a co-worker. Though you managed to end it, you still feel uncomfortable around this person. Should you try to discuss it or pretend it never happened?