merge the latest updates