t6036: add a failed conflict detection case with submodule modify/modify