fix active menu
fix conflit