Segment-safety
Fixed conflict