manually merge V2