diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
index 24ba83f51..2682b7b7a 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
@@ -362,7 +362,10 @@
                     data-bs-parent="#nonCurrent">
 
                     {% if member.getBudgetResources|length > 0 or member.getBudgetCharges|length > 0 %}
+<<<<<<< HEAD
 
+=======
+>>>>>>> 26373e5d238031e1af840ab2e9b4034a2227df0a
                         <div class="flex-table">
                             <h3 class="family-title">{{ 'Actual resources for %name%'|trans({ '%name%' : member.firstName ~ " " ~ member.lastName }) }}</h3>
                             {% if member.getBudgetResources|length > 0 %}