fix delivery api
fix conflict