Seamus 'Cheddar' Plunkett has performed a U-turn and will return as manager of the Laois hurlers.
Plunkett quit his role last week after two of his panel members played a club game for Borris-in-Ossory-Kilcotton against the wishes of management.
His decision to quit shocked the county as they prepared for this weekend's Leinster SHC quarter-final with Offaly in Portlaoise on Sunday.
The county board released a statement this afternoon to say that the situation had been resolved and Plunkett would return.
It read: "Laois GAA wish to announce that following successful discussions, the recent issues concerning Laois Senior Hurling have been resolved, for present.
"The team and management are now finalising preparations for Leinster SHC game on Sunday next. The issues in dispute will be addressed at a later date."
I fear that the loser of next Saturday's replay between Dublin and Galway in Tullamore is in for a short summer. That's the big conclusion gained from watching both teams battle out a Croke Park stalemate and the fear of failure heading into the replay is immense.
Anthony Daly tells a story about the time Danny Sutcliffe first announced himself to the Dublin squad. Two weeks before they were due to play Limerick in the 2011 All-Ireland quarter-final, Dublin travelled to Thurles for a training match.