getting data from facture.js
fix merge conflict