DAR-880 DAR-731 adding test for conflict verification