add auto go to last room
resovlve merge conflicts