Fixed conflict and nullable are being serialized