added pixabay api
fixing merge conflict