merge menu branch with master branch