with report
solved conflicts for the pdf