merge spinner with upstream