changed submodule to merge on update