Change menu style
Merge confilct solve