Merge with local