solve conflict2