Fixed compute_hazard_curves
Fixed conflicts