Conflicts: app/controllers/users_controller.rb app/views/users/_account.haml app/views/users/_profile.haml