Video Pane
Merge Errors fixed