added the web api
fixed merge conflict