try to solve conflict