A media editing system includes one or more machines that are configured to support cloud-based collaborative editing of media by one or more client devices. A machine within the media editing system may be configured to receive a render request for generation of a media frame, determine whether a client device is to generate the media frame, and initiate generation of the media frame. Moreover, a machine within the media editing system may facilitate resolution of conflicts between edits to a particular piece of media. Furthermore, a machine within the media editing system may facilitate provision of convenient access to media from a particular client device to one or more additional client devices.