diff --git a/.gitignore b/.gitignore
index 67f1e08..188ec4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-
->>>>>>> dev
 ### Laravel ###
 vendor/
 node_modules/
@@ -27,3 +23,4 @@ Homestead.json
 .phpunit.result.cache
 .idea
 .nuxt
+.DS_Store