Plan, Listen, Understand
To handle conflict, a manager should be prepared to compromise, communicate and have a plan of action. Firstly, they must acknowledge that the conflict exists. Call a meeting and discuss the impact of the clash and the effect it has on the team as a whole. All parties must agree that the team should come first and use this as a starting foundation.
Secondly, you must understand, where concerned, all parties perspectives. Clarify their points of view and the reasoning behind it. This may be because of their job role, or because they have facts and data to back up their proposal. Be open to all suggestions, remove emotion from each argument and remember to stay in control.