merge-recursive: Fix recursive case with D/F conflict via add/add conflict