Gerry Farrell has returned to work at The Leith Agency less than a fortnight after he was suspended for his spectacular spat with Edinburgh councillor Steve Cardownie.
The Edinburgh-based ad agency today confirmed to The Drum that it had reinstated its creative director and said it now considers the matter closed.
Farrell found himself in the public eye after his advertising campaign to promote the Scottish capital, which included the slogan 'Incredinburgh', was slammed by Cardownie, Edinburgh Council's deputy leader.
The Leith Agency was unimpressed with Farrell's tweets and suspended him on 2 November.
But the argument now appears to have been settled, as a spokesperson for The Leith Agency told The Drum: "Gerry is now back at work and we consider the matter closed."
Farrell's Twitter account - @yellydancer - has been deleted.