c
resolve

Conflicts:
	README.md