Final test for "resolve" mode to ensure that it works as I expect.
.
Merge branch 'v2'

Conflicts:
	README.md