merge-recursive: combine error handling