After a contract conflict that extended into training camp, the Minnesota Vikings and pass-rusher Danielle Hunter have agreed to a new one-year deal that can be worth up to $20 million, a source confirmed to ESPN on Sunday.

Hunter will receive $17 million guaranteed, the source said. Hunter can earn $3 million in sack incentives, and the new agreement prohibits the Vikings from using the franchise or transition tag on him next season, a source confirmed.