Commit to resolve conflict
Merge branch 'master' of https://github.com/shasha-chen/moviestore.git