diff --git a/.gitignore b/.gitignore
index dff815a..a70bc78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,2 @@
-unpackage
-unpackage/*
-<<<<<<< HEAD
-node_modules
-unpackage/*/**
-=======
-node_modules
->>>>>>> eba5f5995696e08f67df615fb32054bffa94ae34
+/unpackage
+/node_modules