merge with v2