bump S::T min version
resolve conflict