Conflicts:

	attributes/default.rb