Solving conflicts.

My thoughts on the subject are here.

Clayton -