Use unicorn in production.
Resolve merge conflicts