to solve conflict