I think the most important thing to do during conflict resolution is to identify WHY the other person is upset. Usually after figuring this out, problems become quite easy to solve. So i'd ask the person why they were upset, and try to figure out how we can avoid situations like that again.