Remove merge conflict artifact