Added to report
Fixed merge conflicts.