v2 with v3 2nd line
resolve conflict in v2