live_stream: resolving merge conflicts.
live_stream: resolving conflicts.