true, but this merge doesn't touch "safe" at all