Adding the salesforce sdk
resolving merge conlflicts