commit by ty

删除冲突文件