fixed model spec
fixed merge conflicts