merge shit
deletes old user model
merge