Adding ReportBundle
Resolving conflicts