Added video playback view
added video playback view
resolve conflicts
fix conflicts
fix conflicts