Remove conflict artifact.

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