working api
conflict resolved