I would probably put

building=retail
building:use=residential

based on photo and faint memory

It looks like a separate building no matter its legal situation so I would put nohousenumber=yes or similar rather than merge it with other building