Fixed merge conflicts

config/initializers/i18n.rb

@@ -37,7 +37,7 @@ module I18n
 			when 't', 'title'
 				return (Forgery::LoremIpsum.sentences 1, options).capitalize
 			end
-			return nil
+			return method
 		end
 
 		def self.note(key, behavior = nil, behavior_size = nil)

config/routes.rb

@@ -14,7 +14,7 @@ BikeBike::Application.routes.draw do
             #resources :workshops, :param => 'slug'
 			#get :register, :param => 'step'
             #post 'register/next' => 'conferences#register_submit'
-            # match 'register(/:step)' => 'conferences#register', via: [:get, :post]
+            match 'register(/:step)' => 'conferences#register', via: [:get, :post]
             #patch 'register/step/:step' => 'conferences#register_step'
 			#resources :registrations, :path => 'registration' do
 			#	get :form, on: :collection