Updated minified files
Merge conflict