readded submodule after shameful squash