menumanage
solve conflict