Make a basic User model (including secure password)
Make a basic User model (including secure passwords) v2
Fix conflict