Merge map and history maps into one