Merged time travel and master