cleanup of api
fixing merge conflict