Movie Controller Changes
Conflict Resolved