edits to report
fixing merge conflicts