Merge with local version