Fix trap
Merged trap fix
Fixed last room