solve conflict3