merged latest versions