NaNaNaN conflict fixes