diff --git a/components/calcValues.vue b/components/calcValues.vue
index 6d25bec..bd54949 100644
--- a/components/calcValues.vue
+++ b/components/calcValues.vue
@@ -149,12 +149,16 @@ const calc_text = computed(() => {
             <div class="form-row">
                 <div class="form-item">
                     <label for="total_length">Общая длина забора, м</label>
+                     <Icon type="button" @click="increment('height', -1)" name="mdi:minus-circle-outline" />
                     <input type="number" id="total_length" v-bind="parametric.total_length"
                         v-model="form_state.total_length" />
+                    <Icon type="button" @click="increment('height', 1)" name="mdi:plus-circle-outline" />
                 </div>
                 <div class="form-item grow">
                     <label for="calculation">Приблизительный расчет забора</label>
+                    <Icon type="button" @click="increment('height', -1)" name="mdi:minus-circle-outline" />
                     <textarea id="calculation" disabled class="w-full">{{ calc_text }}</textarea>
+                    <Icon type="button" @click="increment('height', 1)" name="mdi:plus-circle-outline" />
                 </div>
             </div>
         </form>
diff --git a/components/modal.vue b/components/modal.vue
index c9820bf..490641e 100644
--- a/components/modal.vue
+++ b/components/modal.vue
@@ -42,11 +42,7 @@ const submit = (e: any) => {
             'Content-Type': 'application/json'
         },
         body: JSON.stringify({
-<<<<<<< HEAD
-            name: modal_name || "from site",
-=======
             name: modal_name.value || "ref from site",
->>>>>>> 967478b522cb47f619a266a4908d30f8d165d4f1
             phone: modal_phone.value
         })
     })
diff --git a/components/model/parametric.vue b/components/model/parametric.vue
index a8fd992..f671137 100644
--- a/components/model/parametric.vue
+++ b/components/model/parametric.vue
@@ -29,11 +29,7 @@ const pbrTexture = await useTexture({
 <template>
     <TresGroup>
         <Suspense>
-<<<<<<< HEAD
-            <Environment files='public/hdrmaps/symmetrical_garden_4k.hdr' :background="true" />
-=======
             <Environment files='/hdrmaps/kloppenheim_06_4k.hdr' :background="true" />
->>>>>>> 464163ea2b8072acc2a785823aa39c00cc6d613d
         </Suspense>
         <Suspense>
             <TresGroup :scale="3" :rotate-y="-Math.PI * -0.5" :translate-y="-3.25">