Bump submodule to merged version