merge with the latest version