Spot the link / entityClass error!

templates/actors/npc-sheet.html

@@ -172,4 +172,4 @@
             {{editor content=data.details.biography.value target="data.details.biography.value" button=true owner=owner editable=editable}}
         </div>
     </section>
-</form>
+</form>

templates/actors/parts/actor-features.html

@@ -52,6 +52,29 @@
                 {{/if}}
             </div>
 
+<<<<<<< Updated upstream
+=======
+            {{else if section.isSpecies}}
+            <div class="item-detail player-species">
+
+            </div>
+			
+			{{else if section.isArchetype}}
+			<div class="item-detail player-archetype">
+			    {{item.data.name}}
+			</div>
+			
+			{{else if section.isBackground}}
+			<div class="item-detail player-background">
+			
+			</div>
+			
+			{{else if section.isClassfeatures}}
+			<div class="item-detail player-classfeatures">
+			    {{item.data.name}}
+			</div>
+			
+>>>>>>> Stashed changes
             {{else if section.isClass}}
             <div class="item-detail player-class">
                 {{item.data.subclass}}