fix conflict in CHANGELOG

src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue

@@ -61,6 +61,13 @@
          <input class="form-control form-control-lg" id="name" v-model="thirdparty.text" v-bind:placeholder="$t('thirdparty.name')" />
          <label for="name">{{ $t('thirdparty.name') }}</label>
       </div>
+      <div v-if="query">
+         <ul class="list-suggest add-items inline">
+            <li @click="addQuery(query)">
+               <span class="person-text">{{ query }}</span>
+            </li>
+         </ul>
+      </div>
 
        <template
            v-if="thirdparty.kind !== 'child'">
@@ -102,7 +109,7 @@ import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
 
 export default {
    name: "OnTheFlyThirdParty",
-   props: ['id', 'type', 'action'],
+   props: ['id', 'type', 'action', 'query'],
    components: {
       ThirdPartyRenderBox,
       AddAddress,
@@ -186,6 +193,9 @@ export default {
               this.thirdparty.address = payload.address;  // <--
               console.log('switch address to edit mode', this.context);
           }
+      },
+      addQuery(query) {
+         this.thirdparty.text = query;
       }
    },
    mounted() {