next merge update