diff --git a/.gitignore b/.gitignore
index 4f2f33e..e3111b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ robots.txt
 sitemap*
 .xml
 .htsecure
-cron/yasprav.log
\ No newline at end of file
+cron/yasprav.log
+vizitka/tmp/
\ No newline at end of file
diff --git a/local/components/evolution/form.leasing.nomail/templates/.default/script.js b/local/components/evolution/form.leasing.nomail/templates/.default/script.js
index 4707fb7..3fabcc0 100644
--- a/local/components/evolution/form.leasing.nomail/templates/.default/script.js
+++ b/local/components/evolution/form.leasing.nomail/templates/.default/script.js
@@ -60,33 +60,9 @@ function form_leasing_request_submit()
 			{
 				grecaptcha.execute($("meta[name=recaptcha_site_key]").attr("content"), { action: 'submit' }).then(function(token)
 				{
-<<<<<<< HEAD
-					if(response.status == "complete")
-					{
-						$("#form_leasing_process").css("display","none");
-						$("#form_leasing_success").css("display","flex");
-
-						$("#send_button_text").css("display", "block");
-						$("#send_button_spinner").css("display", "none");
-				
-						leasing_form_submitting = false;
-
-						try
-						{
-							ym(66905533,'reachGoal','leasingform')
-						}
-						catch(e)
-						{
-							console.error(e);
-						}
-						
-					}
-					else if(response.status == "error")
-=======
 					formData.append("recaptcha_token", token);
 
 					$.ajax(
->>>>>>> 096fd217ce378867757d3998e9b6669473b0db85
 					{
 						url: "/api/forms/", type: 'POST', success: function(response)
 						{
@@ -98,8 +74,17 @@ function form_leasing_request_submit()
 
 								$("#send_button_text").css("display", "block");
 								$("#send_button_spinner").css("display", "none");
-						
+
 								leasing_form_submitting = false;
+
+								try
+								{
+									ym(66905533,'reachGoal','leasingform')
+								}
+								catch(e)
+								{
+									console.error(e);
+								}
 							}
 							else if(response.status === "error")
 							{
diff --git a/local/components/evolution/form.leasing/templates/.default/script.js b/local/components/evolution/form.leasing/templates/.default/script.js
index 4e2d49a..3fabcc0 100644
--- a/local/components/evolution/form.leasing/templates/.default/script.js
+++ b/local/components/evolution/form.leasing/templates/.default/script.js
@@ -60,33 +60,9 @@ function form_leasing_request_submit()
 			{
 				grecaptcha.execute($("meta[name=recaptcha_site_key]").attr("content"), { action: 'submit' }).then(function(token)
 				{
-<<<<<<< HEAD
-					if(response.status == "complete")
-					{
-						$("#form_leasing_process").css("display","none");
-						$("#form_leasing_success").css("display","flex");
-
-						$("#send_button_text").css("display", "block");
-						$("#send_button_spinner").css("display", "none");
-				
-						leasing_form_submitting = false;
-
-						try
-						{
-							ym(66905533,'reachGoal','leasingform')
-						}
-						catch(e)
-						{
-							console.error(e);
-						}
-						
-					}
-					else if(response.status == "error")
-=======
 					formData.append("recaptcha_token", token);
 
 					$.ajax(
->>>>>>> 096fd217ce378867757d3998e9b6669473b0db85
 					{
 						url: "/api/forms/", type: 'POST', success: function(response)
 						{
@@ -100,6 +76,15 @@ function form_leasing_request_submit()
 								$("#send_button_spinner").css("display", "none");
 
 								leasing_form_submitting = false;
+
+								try
+								{
+									ym(66905533,'reachGoal','leasingform')
+								}
+								catch(e)
+								{
+									console.error(e);
+								}
 							}
 							else if(response.status === "error")
 							{