update conditions

atlas/templates/atlas/categories_list.html

@@ -1,6 +1,8 @@
 {% extends 'atlas/base.html' %}
 
 {% block content %}
+<h1>Categories</h1>
+<p>The platform has numberous different ways to tag and categorise content. These help with organsing cases and series, given the ability to find cases by a particuarly property (such as a finding) or find similar cases.</p><p>These can be browsed below.</p>
     <ul>
         <li><a href="{% url 'atlas:condition_view' %}">Conditions</a></li>
         <li><a href="{% url 'atlas:finding_view' %}">Findings</a></li>

atlas/templates/atlas/condition_detail.html

@@ -63,8 +63,7 @@
     {% endif %}
 
     
-    {% if not condition.rcr_curriculum %}
-        
+    {% if not condition.rcr_curriculum and can_merge %}
         
     <details><summary>Merge</summary>
 Merge this condition into another. This will transfer all associated cases (and differential) but will not transfer synonymns / parents or children.

atlas/templates/atlas/condition_form.html

@@ -14,7 +14,8 @@
 {% endblock %}
 {% block content %}
     <h2>Add/Edit Condition</h2>
-    Use this form to create or edit a condition.
+    <p>Use this form to create or edit a condition.</p>
+    <p>Please check if it already exists before doing so!</p>
     <form action="" method="post" enctype="multipart/form-data" id="condition-form">
         {% csrf_token %}