fix merge conflicts

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue

@@ -167,6 +167,7 @@ export default {
                })
          }
          else if (payload.type === 'thirdparty') {
+            console.log('data', payload.data)
             body.name = payload.data.text;
             body.email = payload.data.email;
             body.telephone = payload.data.phonenumber;