A single management team will oversee the department store chain and Waitrose from next year.