merge the offical update