Working on printing of reports
Resolving conflicts