change on dev from parent
change on dev from child
Merge commit '730c9c4eac09df3c6ec008c23f1bbe8f1e092f22' into develop

Conflicts:
	sub/README.md
change in prep for release 1
change in the release branch from child
Merge commit 'c9304515fde3ca41a30399aa391674a5a8dbdf30' into release/release-1.0.0

Conflicts:
	sub/README.md