t / test4012.pngon commit more D/F conflict tests (934f930)
t/test4012.png