fix Merge remote-tracking branch 'cool-next-cc/next-cc'