merge-recursive: do not die on a conflicting submodule