diff --git a/styles/components/_accordion_table.scss b/styles/components/_accordion_table.scss
index ce602ebf..a1f438f3 100644
--- a/styles/components/_accordion_table.scss
+++ b/styles/components/_accordion_table.scss
@@ -110,7 +110,7 @@
       font-size: $small-font-size;
       font-weight: $font-normal;
       background-color: $color-gray-lightest;
-      padding: $gap*2 $gap*4 $gap*5 $gap*4;
+      padding: $gap*2 $gap*4;
 
       th, td {
         .icon-link {
diff --git a/templates/portfolios/applications/team.html b/templates/portfolios/applications/team.html
index 89443b3e..c6e07f07 100644
--- a/templates/portfolios/applications/team.html
+++ b/templates/portfolios/applications/team.html
@@ -70,26 +70,6 @@
                   <span class="user-permission{% if "Edit" in value %} green{% endif %}">{{ value }}</span>
                 {% endmacro %}
 
-<<<<<<< HEAD
-              <toggler inline-template>
-                <li class="accordion-table__item">
-                  <div class="accordion-table__item-content">
-                    <span>
-                      {{ name }}
-                      <span>{{ user.full_name }}</span>
-                      <span>{{ user_permissions["delete_access"] }}</span>
-                      <span>{{ user_permissions["environment_management"] }}</span>
-                      <span>{{ user_permissions["team_management"] }}</span>
-                    </span>
-                    <span class="icon-link icon-link--large accordion-table__item__toggler">
-                      {% set open_html %}
-                      {{ "common.show" | translate }} {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }})
-                      {% endset %}
-
-                      {% set close_html %}
-                        {{ "common.hide" | translate }} {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }})
-                      {% endset %}
-=======
                 <toggler inline-template>
                   <li class="accordion-table__item">
                     <div class="accordion-table__item-content">
@@ -108,7 +88,6 @@
                         {% set close_html %}
                           {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }}) {{ Icon('caret_up') }}
                         {% endset %}
->>>>>>> Style updates to portfolio team page:
 
                       {{
                         ToggleButton(
@@ -122,10 +101,8 @@
                   {% call ToggleSection(section_name="environments") %}
                     <ul>
                       {% for environment in user_info["environments"] %}
-                        <li>
-                          <div class="accordion-table__item-content">
-                            {{ environment.name }}
-                          </div>
+                        <li class="accordion-table__item__expanded">
+                          {{ environment.name }}
                         </li>
                       {% endfor %}
                     </ul>