# Conflicts:
#	config/routes/user.rb
#	db/schema.rb

[ci skip]