Fix rebase for streamer.py