The first thing to do to resolve conflict is find the problem.  Then you want to generate options and as you are generating enough options you are going to want to evaluate them.  The best way to evaluate the options is to look at all the options and rate them 1 to 10.  Ten means it is a great idea, one means it stinks.  When you use a 1 to 10 scale to determine the value of each of the options, the highest numbers become self-evident.  I recommend using the 1 to 10 scale and the best options will emerge by themselves.