updated SS + modules
merged composer.lock conflict