Added fredlf's suggested changes.

Signed-off-by: Hollie Teal <hollie@docker.com>
You've got a merge conflict/artifact in your commit.