20140715修改书写错误
delete a coflict file