Resolving conflicts is never easy, especially when you are expected to come up with some sort of decision. That is the reason why it might be useful to come up with some sort of inventive ideas with the help of which it will be easier to solve conflicts.
Obviously, a lot depends on the resources you have in front of you. Yet, there are a few ideas which you may still use. For instance, you might actually encourage the team to work on several ideas in case you cannot decide which one to choose and it creates conflict. In such a way, you will easily resolve conflict as well as might have a few ideas regarding a certain aspect which is clearly a benefit.
Another important issue to mention is that it is quite possible to find a solution that works for everyone in the middle of the conflict. What it necessary to highlight is that conflicts are an essential part of every workplace. This is what helps us find the right decision.