diff --git a/rbackup/struct/hierarchy.py b/rbackup/struct/hierarchy.py
index 3d5f67c..c0aa7bb 100644
--- a/rbackup/struct/hierarchy.py
+++ b/rbackup/struct/hierarchy.py
@@ -67,11 +67,7 @@ class Hierarchy(PathLike):
         return str(self._path)
 
     def __dir__(self):
-<<<<<<< HEAD
         return [
-=======
-        return (
->>>>>>> 2aff6704bc8f14d9a3f73178c4c1709bfc7812b5
             "__dir__",
             "__eq__",
             "__fspath__",
@@ -85,11 +81,7 @@ class Hierarchy(PathLike):
             "cleanup",
             "read_metadata",
             "write_metadata",
-<<<<<<< HEAD
         ]
-=======
-        )
->>>>>>> 2aff6704bc8f14d9a3f73178c4c1709bfc7812b5
 
     def _gen_metadata(self):
         """Generate metadata for this repository.
diff --git a/rbackup/struct/repository.py b/rbackup/struct/repository.py
index 8c96dc3..1e59e6e 100644
--- a/rbackup/struct/repository.py
+++ b/rbackup/struct/repository.py
@@ -144,11 +144,7 @@ class Repository(Hierarchy):
         return next(self._snapshot_iterator)
 
     def __dir__(self):
-<<<<<<< HEAD
         return [
-=======
-        return (
->>>>>>> 2aff6704bc8f14d9a3f73178c4c1709bfc7812b5
             super().__dir__(),
             "__contains__",
             "__delitem__",
@@ -164,11 +160,7 @@ class Repository(Hierarchy):
             "cleanup",
             "create_snapshot",
             "symlink_snapshot",
-<<<<<<< HEAD
         ]
-=======
-        )
->>>>>>> 2aff6704bc8f14d9a3f73178c4c1709bfc7812b5
 
     @staticmethod
     def is_valid_snapshot_name(name):
diff --git a/rbackup/struct/snapshot.py b/rbackup/struct/snapshot.py
index 27b3864..1bbaf88 100644
--- a/rbackup/struct/snapshot.py
+++ b/rbackup/struct/snapshot.py
@@ -32,11 +32,7 @@ class Snapshot(Hierarchy):
         self._pkg_dir = self.path / "pkg"
 
     def __dir__(self):
-<<<<<<< HEAD
         return [super().__dir__(), "ctime", "pkg_dir"]
-=======
-        return super().__dir__(), "ctime", "pkg_dir"
->>>>>>> 2aff6704bc8f14d9a3f73178c4c1709bfc7812b5
 
     def __repr__(self):
         """Return a string representation of this Snapshot."""