delete conflict files

为发布删除冲突文件