Fixes conflict in report