merging code v2a