minified files
Conflicts