@@ -154,7 +154,7 @@ multirun/
 ROADMAP.md
 AGENTS.md
 .github/hooks/sdlc.json
-<<<<<<< before updating
+.superpowers
 
 # Verilator
 verilator/bin/
@@ -172,6 +172,3 @@ verilator/tests/module/*.h
 verilator/tests/module/*.mk
 verilator/tests/module/*.dat
 verilator/tests/module/Vff_top
-=======
-.superpowers
->>>>>>> after updating