The best way to resolve a conflict