modify level 2 solution
solve conflict