merge
shop room fixed