fix film selection
fix bug selection
end conflict