add api
fix conflict