adding conflict report
adding conflict report