Worked on report
Merged conflicts