Clean all of build for usemin
Fixed merge conficts
attempted production build
production commit 2