Resolving issues with submodule dependencies