Added static getRooms method to Room class.
Resolved Merge Confict