Fix merge conflict artifact