Modify conflict report to show what is replaced.