lock for VidPid added
merging files