Resolve .gitignore merge conflict

.gitignore

@@ -1,3 +1,5 @@
+# L'Oréal Box Asset Submission - Project-specific ignores
+
 # Composer dependencies
 /vendor/
 composer.lock
@@ -5,6 +7,27 @@ composer.lock
 # Configuration files (contain sensitive data)
 43984435_77m2ujl3_config.json
 
+# Environment-specific configs
+.env
+.env.local
+config.local.php
+
+# Temporary files
+tmp/
+temp/
+cache/
+
+# IDE files
+.vscode/
+.idea/
+*.sublime-project
+*.sublime-workspace
+
+# Log files
+*.log
+error_log
+debug.log
+
 # System files
 .DS_Store
 Thumbs.db
@@ -12,23 +35,35 @@ Thumbs.db
 *.swo
 *~
 
-# IDE files
-.vscode/
-.idea/
-*.sublime-project
-*.sublime-workspace
+# General ignores from Bitbucket template
+# Node artifact files
+node_modules/
+dist/
 
-# Logs
-*.log
-error_log
-debug.log
+# Compiled Java class files
+*.class
 
-# Temporary files
-tmp/
-temp/
-cache/
+# Compiled Python bytecode
+*.py[cod]
 
-# Environment-specific configs (if you create them later)
-.env
-.env.local
-config.local.php
+# Package files
+*.jar
+
+# Maven
+target/
+
+# Unit test reports
+TEST*.xml
+
+# Applications
+*.app
+*.exe
+*.war
+
+# Large media files
+*.mp4
+*.tiff
+*.avi
+*.flv
+*.mov
+*.wmv