DAR-731 better conflict handling