Conflicts:
	Gemfile.lock

use strict;