Added forecast summary
Fixed conflict