Merge with latest base