resolved merge conflict

Conflicts:
	concert/helpers.py