added room labels
fixed conflicts