Merge map with upstream
Keep last merged upstream map