removed old API_KEY from code
fixed merge conflicts