working with API calls
fixing merge conflicts