"The main issue was that we did not have preparation going in for the Olympics, but that has been sorted now. We are going to play two tournaments -- one before Wimbledon and the other after it," a relieved Bhupathi, who had been demanding that Paes spend more time with him on court before Olympics, said.

Paes and Bhupathi agreed to bury the hatchet after a round of peace talks brokered by All India Tennis Association Secretary General Anil Khanna in Paris on June 2.

Besides playing two tournaments together, the duo has also agreed to train together for a week.

Paes said he was satisfied with the patch up reached and was now focussed on getting a medal for the country.

"Playing for the country is of utmost importance for me. That's why I spoke to my (current) partner (Lukas Dlouhy) to take some time off the circuit and play with Mahesh. I am happy that I found two weeks to do that ... it's about training as well, camaraderie and don't forget we have eight years of experience," Paes told a telivision news channel.

"Now that we are playing together we need to go there and really work hard," he added.

Bhupathi, meanwhile, said he and Paes had a decent chance of grabbing a medal in Beijing in what would perhaps be their last Olympics.