fix merge conflicts

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

@@ -40,16 +40,16 @@
          <div class="form-check">
             <input class="form-check-input mt-0" type="radio" v-model="kind" value="contact" id="tpartyKindContact">
             <label for="tpartyKindContact" class="required">
-                  <badge-entity
-                     :entity="{ type: 'thirdparty', kind: 'contact' }"
-                     :options="{ displayLong: true }">
-                  </badge-entity>
+               <badge-entity
+                  :entity="{ type: 'thirdparty', kind: 'contact' }"
+                  :options="{ displayLong: true }">
+               </badge-entity>
             </label>
          </div>
       </div>
       <div v-else>
-         <third-party-render-box
-            :thirdparty="thirdparty"
+         <p>Contact de&nbsp;:</p>
+         <third-party-render-box :thirdparty="thirdparty.parent"
             :options="{
                   addInfo: true,
                   addEntity: false,
@@ -118,7 +118,7 @@
       <div class="input-group mb-3">
          <span class="input-group-text" id="phonenumber"><i class="fa fa-fw fa-phone"></i></span>
          <input class="form-control form-control-lg"
-            v-model="thirdparty.telephone"
+            v-model="thirdparty.phonenumber"
             v-bind:placeholder="$t('thirdparty.phonenumber')"
             v-bind:aria-label="$t('thirdparty.phonenumber')"
             aria-describedby="phonenumber" />

src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_form.html.twig

@@ -23,15 +23,15 @@
 {{ form_row(form.contactDataAnonymous) }}
 {% endif %}
 
+{% if form.address is defined %}
+    {{ form_row(form.address) }}
+{% endif %}
+
 {% if form.activeChildren is defined %}
     <h2>{{ 'Contacts'|trans }}</h2>
     {{ form_widget(form.activeChildren) }}
 {% endif %}
 
-{% if form.address is defined %}
-    {{ form_row(form.address) }}
-{% endif %}
-
 {{ form_row(form.comment) }}
 
 {% if form.centers is defined %}