Monday
Fix some conflicts
Adjust rooms
More fixes