1. merge v2 version