diff --git a/.gitignore b/.gitignore
index 1c09a347..29023fa4 100755
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,7 @@ package-lock.json
 .git-rewrite/
 .php-cs-fixer.cache
 node_modules
+<<<<<<< HEAD
 build
+=======
+>>>>>>> 40bed5b (chore(gitignore): remove conflict markers from .gitignore file)