merged latest and greatest development