add 777 movies
fix merge conflict
modify README.txt