working on weather api info
fixed merge