conflicto
Merge branch 'master' of https://github.com/inpactdev/BlueiReportv2