merge the official update