Merge changes between standalone and Django files.