fix conflict

src/SpecialForce/Proposal.tw

src/SpecialForce/SpecialForce.js

src/SpecialForce/Upgrades.tw

src/art/vector/VectorArtJS.js

src/cheats/mod_EditArcologyCheat.tw

src/cheats/mod_EditChildCheatNew.tw

src/cheats/mod_EditSlaveCheat.tw

src/cheats/mod_editSlaveCheatNew.tw

src/endWeek/saChoosesOwnClothes.js

src/endWeek/saServeThePublic.js

src/events/intro/initNationalities.tw

src/facilities/brothel/brothelAssignmentScene.tw

src/facilities/penthouse/penthouseFramework.js

src/facilities/schoolroom/schoolroomFramework.js

src/gui/Encyclopedia/encyclopedia.tw

src/init/storyInit.tw

src/js/generateGenetics.js

src/js/generateMarketSlave.js

src/js/physicalDevelopment.js

src/js/slaveSummaryWidgets.js