half way
Merge remote-tracking branch 'origin/master'
fixed VC
Merge remote-tracking branch 'origin/master'