diff --git a/ext/fs/sync.rs b/ext/fs/sync.rs
index 749e4ee02e..a263b92e97 100644
--- a/ext/fs/sync.rs
+++ b/ext/fs/sync.rs
@@ -46,6 +46,11 @@ mod inner {
 #[cfg(not(feature = "sync_fs"))]
 mod inner {
   pub use std::rc::Rc as MaybeArc;
+<<<<<<< HEAD
+=======
+  use std::ops::Deref;
+  use std::ops::DerefMut;
+>>>>>>> 2e7254f2a (fix(ext/fs): fix MaybeArc when not sync_fs)
 
   pub trait MaybeSync {}
   impl<T> MaybeSync for T where T: ?Sized {}