merge latest updates