merging menu branch