update merit and gems

Conflicts:

	Gemfile
	Gemfile.lock