solved [watch more movie]
Merge remote-tracking branch 'origin/master'