Build manually due to customization of usemin [ci skip]
Resolve conflicts