merge latest version