File level conflict report added