diff --git a/esp-hal/src/spi/master/dma.rs b/esp-hal/src/spi/master/dma.rs
index 793eeff2a3c..2ac702b8a6a 100644
--- a/esp-hal/src/spi/master/dma.rs
+++ b/esp-hal/src/spi/master/dma.rs
@@ -7,6 +7,12 @@ use core::{
 
 #[cfg(feature = "unstable")]
 use embedded_hal::spi::{ErrorType, SpiBus};
+<<<<<<< HEAD
+=======
+use enumset::EnumSet;
+#[cfg(place_spi_master_driver_in_ram)]
+use procmacros::ram;
+>>>>>>> 2c57b119 (fix: Missing import when building with SPI driver in RAM (#5585))
 
 use super::*;
 use crate::{