fix merge for PSS