merge version 2