update app.rb
resolve merge conflict...i think
remove password confirmation field
update user session to hash