Created films module
Solved merge conflicts