Deleted a conflict file.