curl: fix merge conflict