merge-recursive: Fix D/F conflicts