合并原作者更新

wait to be tested