Remove conflict artifact