fixing submodule things
merge fix