fix conflicts

.eslintrc.json

.gitignore

devNotes/VersionChangeLog-Premod+LoliMod.txt

slave variables documentation - Pregmod.txt

src/cheats/mod_EditChildCheatNew.tw

src/cheats/mod_EditSlaveCheat.tw

src/cheats/mod_editSlaveCheatNew.tw

src/endWeek/saServeThePublic.js

src/endWeek/saWorkAGloryHole.js

src/interaction/cyberConfig.tw

src/js/SlaveState.js

src/js/datatypeCleanupJS.js

src/js/descriptionWidgets.js

src/js/generateNewSlaveJS.js

src/npc/newSlaveIncestSex.tw

src/player/actions/fCaress.tw

src/player/actions/fEmbrace.tw

src/player/actions/fondleBoobs.tw

src/pregmod/organFarmOptions.tw

src/pregmod/rePregInventor.tw