use http api instead of shell exec
merge CONFLICT