Resolve merge conflicts in film model and remove output:json duplication.