Update .gitignore

Author: timkpaine

.gitignore

@@ -151,12 +151,9 @@ multirun/
 ROADMAP.md
 AGENTS.md
 .github/hooks/sdlc.json
-<<<<<<< before updating
+.superpowers
 
 # Test parts
 hatch_js/tests/test_project_basic/js/dist
 hatch_js/tests/test_project_basic/js/node_modules
 hatch_js/tests/test_project_basic/project/extension
-=======
-.superpowers
->>>>>>> after updating