resolve merge conflict

Conflicts:
	setup.py