Merry Market returns to City Market