Fixed some merge errors in webcam