printed giro reports
merge conflicts