solve conflict

Conflicts:
	lib/cb/responses/resumes/put.rb