resolved submodule issues