merged latest version