Something went wrong during a previous commit
Trying again

Conflicts:
	client/views/clubs/club_item.html