FIXUP: merge conflicts

opentech/public/funds/templates/public_funds/includes/fund_apply_cta.html

@@ -12,7 +12,7 @@
                 </h3>
               </div>
             {% endif %}
-            <a href="{% pageurl fund_type %}" class="link link--button-secondary">
+            <a href="{% pageurl fund_page.fund_type %}" class="link link--button-secondary">
                 {% trans "Apply for this fund" %}
             </a>
         {% else %}
@@ -22,4 +22,3 @@
         {% endif %}
     </div>
 </div>
-