curl: fix bad merge
openssl: fix bad merge