forecast weather icons working after merge