Update javascript sdk
Fixed conflicts