The final step to resolving conflict, once you have defined the problem, come up with multiple options, evaluated the options, chosen what you want to do and implemented the solutions is to follow up. It is absolutely essential that you follow up. You must meet again with the people with whom you have conflict. If you fail to follow up the whole thing will evaporate. And, when you do follow up, fine-tune and keep going and the resolution is solid. Remember to follow up.