Updating the api
Removed comflicted file