fix conflicts

.eslintrc.json

Changelog.txt

src/js/DefaultRules.js

src/js/SlaveState.js

src/js/datatypeCleanupJS.js

src/js/pregJS.js

src/js/rulesAssistant.js

src/js/rulesAssistantOptions.js

src/js/slaveSummaryWidgets.js

src/js/utilJS.js

src/npc/descriptions/boobs/boobs.js

src/npc/descriptions/boobs/piercing.js

src/pregmod/analyzePlayerPregnancy.tw

src/pregmod/analyzePregnancy.tw

src/pregmod/incubator.tw

src/pregmod/incubatorReport.tw

src/uncategorized/BackwardsCompatibility.tw

src/uncategorized/arcologyDescription.tw

src/uncategorized/buildingWidgets.tw

src/uncategorized/longSlaveDescription.tw