delete more conflicted file