merge-recursive: conflicting rename case.