merge with old version