Fix bad merge conflict artifact.