trying to solve conflict