changes in report
init report
conflicts resolved
detailed report