fixed merge conflicts in movies index and movies controller