Remove conflict artifact.
Merge pull request #7081 from cirosantilli/conflict-artifact

Remove conflict artifact.