merge-recursive: Replace 'except:'