修正年表勢力
Merge remote-tracking branch 'upstream/master'