added menu
fix style
fix merge conflict