continuation on report
resolving conflicts
adding graph to report