Updating contact email address to sdk support
fixing merge conflicts
fixing merge conflict