fix merge conflict

artTools/vector_source_ndextras.svg

artTools/vector_source_ndmain.svg

devNotes/Deepmurk_Vector_Art_Changelog.txt

devNotes/VersionChangeLog-Premod+LoliMod.txt

devNotes/twine JS

devTools/spell_check.txt

slave variables documentation - Pregmod.txt

src/SecExp/attackOptions.tw

src/SecExp/encyclopediaSecExpBattles.tw

src/SecExp/encyclopediaSecExpMain.tw

src/art/vector/Body_Clothing_Control.tw

src/art/vector/Feet.tw

src/art/vector/Set_Colour_Shoe.tw

src/art/vector/Set_Colour_Skin.tw

src/art/vector/layers/Arm_Outfit_Abaya.tw

src/art/vector/layers/Shoes_Boot_Narrow.tw

src/art/vector/layers/Shoes_Boot_Normal.tw

src/art/vector/layers/Shoes_Boot_Wide.tw

src/art/vector/layers/Shoes_Extreme_Heel_Narrow.tw

src/art/vector/layers/Shoes_Extreme_Heel_Normal.tw