soreuseport: Resolve merge conflict for v4/v6 ordering fix