git checkout master
git pull https://toscode.mulanos.cn/Hemmelfort/Civ6ModdingNotes.git revert-merge-2-master
git push origin master