merge roomSelection fixed