I would first get a lowdown on the actual problem and try to work out a solution to the conflict. I have seen many conflicts getting worked out if the right amount of time is given, or if there is some opportunity that is bigger than personal and trivial issues between people.