Merge with current version