merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir