temp fix for invalid ssl cert
Fixed ssl verification
Fixed merge conflicts