fix reset-db workflow and merge error

.github/workflows/reset-db.yaml

@@ -34,8 +34,8 @@ jobs:
       - name: Delete existing data for ${{ github.event.inputs.environment }}
         uses: 18f/cg-deploy-action@main
         with:
-          cf_username: ${{ secrets[CF_USERNAME] }}
-          cf_password: ${{ secrets[CF_PASSWORD] }}
+          cf_username: ${{ secrets[env.CF_USERNAME] }}
+          cf_password: ${{ secrets[env.CF_PASSWORD] }}
           cf_org: cisa-getgov-prototyping
           cf_space: ${{ github.event.inputs.environment }}
           full_command: "cf run-task getgov-${{ github.event.inputs.environment }} --command 'python manage.py flush --no-input' --name flush"

src/registrar/templates/includes/summary_item.html

@@ -47,7 +47,6 @@
     {{ value }}
   </p>
   {% endif %}
-    </div>
 
     {% if edit_link %}
     <a
@@ -57,5 +56,4 @@
     </a>
     {% endif %}
 
-  </div> 
 </section>