added new reports
rebuild conflicts