diff --git a/src/Filesystem.php b/src/Filesystem.php
index a5ad9df581add1558f04c0288f5d523905d700ab..6ab85fd8d7913b9e8aeb5e48cc47b452460c4a5d 100644
--- a/src/Filesystem.php
+++ b/src/Filesystem.php
@@ -2,10 +2,7 @@
 
 namespace thans\filesystem;
 
-<<<<<<< HEAD
 use InvalidArgumentException;
-=======
->>>>>>> dad577fc6bb356e0e3075795ebcbe56d625ce8a4
 use think\filesystem\Driver;
 use think\helper\Arr;
 use think\Manager;