Lidl has poked fun at M&S after stepping into a dispute over the name of flavours at a local ice cream parlour.