fix user model after old merge, specs're green