fixed merge conflicts on user.rb, db.log, user_spec
concluded merge