add uglified version for users
Resolve merge conflicts