fixed things with the videocap method
fixed the merge conflict