Conflicts: db/schema.rb Changes title in finish_signup page Conflicts: config/locales/en.yml config/locales/es.yml