merged all local copies to one vc
merge commit part 2