Messed up the merge commit -- update submodule properly