Waterstones U-turns over unbranded bookshop in Edinburgh