Tiger Woods and Nick Faldo appeared to put an end to their feud prior to playing together in the first two rounds of the Open at Hoylake.
Faldo came over to shake the hand of the American and they exchanged words during a practice session on Wednesday.
The feud began after Faldo was critical of the world number one's swing at the Buick Invitational last year.
Woods, who won the Open by five shots in 2005, will tee off at 1439 BST alongside Faldo and Shingo Katayama.
Earlier in the week, Woods had said that he was unsure as to whether the pair would shake hands.
"I really don't know," said Woods. "It's up to him.
"I'll be in my world trying to compete and trying to win the championship and he'll probably do the same thing."
"We really don't talk much," Woods added. "I've only played with him two times since I've been a pro and there wasn't a lot of talking there either."
Woods said he would be "surprised" if Faldo wanted to talk to him during their opening round, but Faldo later joked on BBC Radio Five Live: "Then I'll shock him!"