Fixing minified conflict version
Merge pull request #697 from tomasAlabes/non-amd

Fixing minified conflict version