Update app/views/movies/index.html.haml

fixing conflict with local repo