Add scopes in movie model
resolving conflict
resolve conflict