remove conflict artifact