fix conflicts

Changelog.txt

devNotes/Useful JS Function Documentation.txt

devNotes/clothing hair and accessory passages.txt

devNotes/legacy files/pronoun fix functions.txt

devNotes/scene-guide.txt

devTools/FC.d.ts

devTools/PreCompile.sh

devTools/dictionary_phrases.txt

devTools/dictionary_wholeWords.txt

slave variables documentation - Pregmod.txt

src/002-config/fc-js-init.js

src/002-config/fc-version.js

src/Mods/DinnerParty/dinnerPartyExecution.tw

src/SecExp/attackOptions.tw

src/SecExp/attackReport.tw

src/SecExp/authorityReport.tw

src/SecExp/rebellionGenerator.tw

src/SecExp/rebellionReport.tw

src/SecExp/secExpSmilingMan.tw

src/SpecialForce/NamingColonel.tw