Fix submodule squashing into unrelated commit