Try arel master

Conflicts:
	Gemfile