merging with latest base