added room_count
fixed conflicts