Finish resolving conflicts from last merge of CURLHandle