# Conflicts:
#	app/models/project_feature.rb
#	db/schema.rb

[ci skip]