Added fredlf's suggested changes.

Signed-off-by: Hollie Teal <hollie@docker.com>
Removed merge conflict artifacts.

Signed-off-by: Hollie Teal <hollie@docker.com>
Merge pull request #7546 from hollietealok/master

Added fredlf's suggested changes.