The long-standing rivalry between Dish Network and TiVo may have come to a close. After dealing with numerous court battles that ended up in a nasty injunction, it seems Dish has finally agreed to shell out a sizable $104 million in damages over to TiVo.

The issue, which started with a patent infringement claim TiVo made about a DVR system that Dish pushed out, worried many customers that owned EchoStar-built DVRs. The concern was that Dish Network would recall them, which would be bad news all around. For the customers’ sake, Dish found a workaround and was able to implement it in time.