diff --git a/.gitignore b/.gitignore
index ca2c01a..489bdd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -159,7 +159,3 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
-<<<<<<< HEAD
-=======
-
->>>>>>> 638a19d39481855fcdac76f9c3ec23c860db016d
diff --git a/lib64 b/lib64
deleted file mode 120000
index 7951405..0000000
--- a/lib64
+++ /dev/null
@@ -1 +0,0 @@
-lib
\ No newline at end of file