tried to solve conflict