Resolved conflict in métier.js