Fix assets for production environment
Resolve merge conflict