merged live version