make users show page and resolve conflict in models/user.rb. ???