Add curl
Resolve conflict.