working api calls
fix merge conflict