Merge when updating submodules on make