Gillingham chairman Paul Scally says the club have reached agreement with Stevenage Borough over manager Mark Stimson.
Stimson was handed the Gills reins at the beginning of the month just days after resigning as manager of the Blue Square Premier side.
Boro chairman Phil Wallace had threatened legal action over the move, but Scally claims a settlement regarding Stimson and number two Scott Barrett, which will include a pre-season friendly next summer, has now been reached.
"I'm delighted things have been resolved," he told the club's official website.
"Mark and Scott have both come into the club and instantly shown their qualities. I'm very happy with the overall conclusion.
"Things were discussed in a good manner and I'm happy that all has been settled.
"The club can now really push forward with an excellent manager at the helm."