Removed merge conflict artifacts.

Signed-off-by: Hollie Teal <hollie@docker.com>