fixed all

ss14 was deleted by conflicts