Merge submodule changes