diff --git a/ext/fs/sync.rs b/ext/fs/sync.rs
index a263b92e97..091ea076c4 100644
--- a/ext/fs/sync.rs
+++ b/ext/fs/sync.rs
@@ -45,12 +45,9 @@ 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 use std::rc::Rc as MaybeArc;
 
   pub trait MaybeSync {}
   impl<T> MaybeSync for T where T: ?Sized {}