fixed menupage
fixed merge conflict