Person_entity fixes

entity/Person_entity/Person_entity.aod

@@ -760,10 +760,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
         </entityParameter>
       </children>
     </entityProvider>
-<<<<<<< HEAD
-    <entityField>
-      <name>ORGANISATION_NAME</name>
-    </entityField>
     <entityConsumer>
       <name>360DegreeObjects</name>
       <title>360 Degree</title>
@@ -780,8 +776,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
         </entityParameter>
       </children>
     </entityConsumer>
-=======
->>>>>>> e6bff1f416a5ecb607992832678b33fe6b6a0084
   </entityFields>
   <recordContainers>
     <dbRecordContainer>