FIXED Rooms.java merge catastrophe