t1404: add a bunch of tests of D/F conflicts