Merge with previous local version