diff --git a/.env.development b/.env.development
index 33af2d0c..ce344c5f 100755
--- a/.env.development
+++ b/.env.development
@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 APP_VERSION="0.5.84"
 =======
 APP_VERSION="0.5.85"
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
+APP_VERSION="0.5.85"
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
diff --git a/.env.example.production b/.env.example.production
index d24bae8a..41bc8a2b 100755
--- a/.env.example.production
+++ b/.env.example.production
@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 APP_VERSION="0.5.84"
 =======
 APP_VERSION="0.5.85"
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
+APP_VERSION="0.5.85"
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet
diff --git a/.env.test.risosrv b/.env.test.risosrv
index 73ab0ee0..97f3a0f0 100755
--- a/.env.test.risosrv
+++ b/.env.test.risosrv
@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 APP_VERSION="0.5.84"
 =======
 APP_VERSION="0.5.85"
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
+APP_VERSION="0.5.85"
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet
diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development
index 33af2d0c..ce344c5f 100755
--- a/_ALL_SITES/riso.app/.env.development
+++ b/_ALL_SITES/riso.app/.env.development
@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 APP_VERSION="0.5.84"
 =======
 APP_VERSION="0.5.85"
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
+APP_VERSION="0.5.85"
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production
index 2f6b179d..f0976b62 100644
--- a/_ALL_SITES/riso.app/.env.production
+++ b/_ALL_SITES/riso.app/.env.production
@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 APP_VERSION="0.5.84"
 =======
 APP_VERSION="0.5.85"
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
+APP_VERSION="0.5.85"
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet
diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development
index da18efc3..81dfe631 100755
--- a/_ALL_SITES/terradellavisione.app/.env.development
+++ b/_ALL_SITES/terradellavisione.app/.env.development
@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 APP_VERSION="0.5.84"
 =======
 APP_VERSION="0.5.85"
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
+APP_VERSION="0.5.85"
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="14"
 DIRECTORY_LOCAL="newfreeplanet"
diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue
index 0a8d7e95..19aa0ed5 100755
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -1105,13 +1105,19 @@
       </CMyCardCircuitPopup>
       <CMyCardService v-else-if="mytable === 'myskills'"
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
+=======
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
         :table="mytable" :prop_myrec="myrecdialog">
       </CMyCardService>
       <CMyCardService v-else-if="mytable === 'mygoods'"
         :table="mytable" :prop_myrec="myrecdialog">
       </CMyCardService>
       <CMyCardService v-else-if="mytable === 'myhosps'"
+<<<<<<< HEAD
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
         :table="mytable" :prop_myrec="myrecdialog">
       </CMyCardService>
diff --git a/src/components/CMyCardService/CMyCardService.vue b/src/components/CMyCardService/CMyCardService.vue
index 5d070e35..8682c34a 100644
--- a/src/components/CMyCardService/CMyCardService.vue
+++ b/src/components/CMyCardService/CMyCardService.vue
@@ -146,9 +146,12 @@
               }}</q-item-label>
             </q-item-section>
           </q-item>
+<<<<<<< HEAD
 <<<<<<< HEAD
           <q-item>
 =======
+=======
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 
           <q-item v-if="getSectorByRec(myrec)">
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
diff --git a/src/css/app.scss b/src/css/app.scss
index b2d06326..b73db84a 100755
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -1630,4 +1630,7 @@ h3 {
   color: grey;
   font-size: 0.8rem;
 }
+<<<<<<< HEAD
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 679529fc..f991fb4d 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -1489,6 +1489,11 @@ const msg_it = {
       bookmark_set: 'Aggiunto ai Segnalibri',
       bookmark_unset: 'Rimosso dai Segnalibri',
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+      favorite: 'Utenti Favoriti',
+      bookmark: 'Utenti Segnalibri',
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 =======
       favorite: 'Utenti Favoriti',
       bookmark: 'Utenti Segnalibri',