Waitrose-Morrisons deal to go ahead