fix cherry.txt bug in development
Merge remote-tracking branch 'origin/dev'