New Crystal Palace manager Neil Warnock has made his peace with winger Jason Puncheon.
The pair came to blows in January after Puncheon’s wayward penalty in Palace’s 2-0 defeat at White Hart Lane.
Warnock criticised on radio the decision to allow the winger to take the spot kick, claiming Puncheon could not be trusted to score.
Puncheon retaliated with derogatory messages on Twitter, which he later deleted.
He said he would accept "banter" and "opinions" over his miss and tweeted: "As a man I will live with that, which is fine, but I will not live with [Warnock's] opinion."
Puncheon was fined £15,000 by the FA for his comments.
In spite of the criticism, returning manager Warnock, who denied any wrongdoing in the feud, had nothing but praise for the player.
He said: “We’ve had a good talk and I’m delighted with his response, everybody says things in haste and he’s a very important part of this squad.
“If he gets his head right, he can be up there with the best in the league,” he added.
Much was said about the frosty relationship between the pair upon Warnock's arrival, but the former Sheffield United boss has no problems with him in the side.
“He’s a hard worker so he’ll be involved on Saturday.”