adding to vid2folder line 111
merging conflicted state of vid2copy chooseing both