Remove conflict artifact.

Created by: cirosantilli

git grepped for any other artifacts, nothing left. My bad.

合并请求报告