Conflict Fix

devNotes/legacy files/old preg malus.txt

devNotes/twine JS.txt

sanityCheck

src/Mods/DinnerParty/dinnerPartyExecution.tw

src/SecExp/attackOptions.tw

src/SecExp/attackReport.tw

src/SecExp/rebellionReport.tw

src/SecExp/secExpSmilingMan.tw

src/SecExp/transportHub.tw

src/cheats/mod_EditChildCheatNew.tw

src/cheats/mod_editSlaveCheatNew.tw

src/events/intro/initNationalities.tw

src/events/intro/introSummary.tw

src/events/intro/pcExperienceIntro.tw

src/facilities/farmyard/farmyard.tw

src/facilities/farmyard/farmyardReport.tw

src/facilities/nursery/acDump.tw

src/facilities/nursery/childInteract.tw

src/facilities/nursery/childSummary.tw

src/facilities/nursery/longChildDescription.tw