Roger Federer is set to appear at his hometown event in Basel after he and the tournament once again renewed their agreement.
Federer's participation last year was in doubt when the two sides were unable to make a deal, reportedly disagreeing over appearance fees. The five-time tournament champion finally played without an agreement in place.
"The situation has calmed down," said the tournament director, Roger Brennewald, to media in Switzerland.
The terms of the new agreement were not disclosed.
In addition to Federer, Rafael Nadal is also set to appear — the Spaniard was scheduled to play last year but pulled out of the event. Stanislas Wawrinka, Switzerland's newest Grand Slam champion, is entered as well and reportedly has a three-year agreement at the tournament.