solve conflict4