# Conflicts: # Session/Media Viewing & Editing/MediaInfoVC+MediaPreviewView.swift # SignalUtilitiesKit/Media Viewing & Editing/OWSVideoPlayer.swift