add devise model
merge