Fix a botched merge commit

Conflicts:
	Gemfile.lock