add test for password(user model)
add test for password(user model)
merge with thamself(trouble with --amend)
check conflicts after merging with finished fearutres branch