merging submodule changes in