Merge cleanup and hotel basement item placement bugfix