resolving conflict2