fixed issues with submodule foo when merging repos