resolve conflict2