fixing a bug in pfss_shock_run_csgs
Fixed conflicts and merged time change to pfss_shock_run_csgs