From 5c8cddf5fe95357ab0a583c1bb7e89164842d61d Mon Sep 17 00:00:00 2001
From: Paul Schoenfelder <955793+bitwalker@users.noreply.github.com>
Date: Thu, 7 Mar 2024 20:58:10 -0500
Subject: [PATCH] fix: merge conflict

---
 verifier/src/lib.rs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/verifier/src/lib.rs b/verifier/src/lib.rs
index f704758ec6..75b95e83cb 100644
--- a/verifier/src/lib.rs
+++ b/verifier/src/lib.rs
@@ -1,13 +1,16 @@
-#![cfg_attr(not(feature = "std"), no_std)]
+#![no_std]
+
+extern crate alloc;
+
+#[cfg(feature = "std")]
+extern crate std;
 
 use air::{HashFunction, ProcessorAir, ProvingOptions, PublicInputs};
+use alloc::vec;
 use core::fmt;
-use vm_core::{
-    crypto::{
-        hash::{Blake3_192, Blake3_256, Rpo256},
-        random::{RpoRandomCoin, WinterRandomCoin},
-    },
-    utils::vec,
+use vm_core::crypto::{
+    hash::{Blake3_192, Blake3_256, Rpo256},
+    random::{RpoRandomCoin, WinterRandomCoin},
 };
 use winter_verifier::verify as verify_proof;