emergency revert to mjpeg stream
fixed merge conflict