Amazon to end commingling after years of complaints from brands and sellers