fixed merge conflict
got started with api calls