add weather chart
fix merge conflicts
fix weather chart
fix merge issues
fix git issues