merge old and new version
merge old and new version