resolve conflicts

src/endWeek/saLongTermEffects.js

src/endWeek/saRelationships.js

src/events/intro/introSummary.js

src/events/intro/pcAppearance.js

src/events/intro/pcBodyIntro.js

src/facilities/bodyModification/bodyModification.js

src/gui/css/options.css

src/gui/options/options.js

src/gui/options/optionsPassage.js

src/js/DefaultRules.js

src/js/vignettes.js

src/npc/generate/newChildIntro.js

src/uncategorized/officeDescription.tw

src/uncategorized/reFSEgyptianRevivalistAcquisition.tw

src/uncategorized/seCoursing.tw

themes/light/options.css