css/menu.less: resolve merge conflict