weather icons added
merge