merge with previous version