oops forgot to merge model submodule in last merge