fix video
Merge remote-tracking branch 'upstream/master'
fix contact
Merge remote-tracking branch 'upstream/master'
master