Middlesbrough manager Aitor Karanka will resume his first-team duties with immediate effect after missing Sunday's 2-0 loss to Charlton.
Karanka was reportedly involved in a quarrel with his players ahead of the match, storming out of a training session and throwing his future as manager into doubt.
Related: Middlesbrough's Karanka to miss Sunday's match after alleged bust-up
But peace has apparently been achieved.
"We have 10 games left this season and as a club we are fully focused on what remains of our Championship campaign," the club said in a statement.
Middlesbrough, tipped for promotion at the beginning of the season, is currently second in the division, seven points behind leader Burnley.