Macmillan will end e-book discounting ban in price-fixing settlement