fixed a catastrophic merge conflict error from before in movies.js