ci local content/Author/river.md
fixed Merge conflict in content/Author/river.md
解决编译问题