diff --git a/.gitignore b/.gitignore
index 10ffc2d..a5dbc7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,6 @@
 /development/
 
 # Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode,laravel,vuejs,phpstorm
-<<<<<<< Updated upstream
-=======
-composer-prod.json
->>>>>>> Stashed changes
 # Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,laravel,vuejs,phpstorm
 
 ### Laravel ###