merge-recursive: demonstrate an incorrect conflict with submodule