merging report cards removed conflicts