updating simplecs library version
fixed merge conflicts