diff --git a/resources/mix/custom/authentication/sign-in/uim.js b/resources/mix/custom/authentication/sign-in/uim.js
index fb6f0d3..5444ea3 100644
--- a/resources/mix/custom/authentication/sign-in/uim.js
+++ b/resources/mix/custom/authentication/sign-in/uim.js
@@ -7,15 +7,9 @@ var KTSigninGeneral = function () {
                 fields: {
                     email: {
                         validators: {
-<<<<<<< HEAD
                             notEmpty: { message: "User ID is required" }
                         }
                     }, password: { validators: { notEmpty: { message: "The password is required" } } }
-=======
-                            notEmpty: {message: "User ID is required"}
-                        }
-                    }, password: {validators: {notEmpty: {message: "The password is required"}}}
->>>>>>> 65399f816aeb801ace04e36b378a47806c904a11
                 },
                 plugins: {
                     trigger: new FormValidation.plugins.Trigger,
@@ -37,11 +31,7 @@ var KTSigninGeneral = function () {
                             icon: "error",
                             buttonsStyling: !1,
                             confirmButtonText: "Ok, got it!",
-<<<<<<< HEAD
                             customClass: { confirmButton: "btn btn-primary" }
-=======
-                            customClass: {confirmButton: "btn btn-primary"}
->>>>>>> 65399f816aeb801ace04e36b378a47806c904a11
                         })
                     })).catch((function (t) {
                         Swal.fire({
@@ -49,11 +39,7 @@ var KTSigninGeneral = function () {
                             icon: "error",
                             buttonsStyling: !1,
                             confirmButtonText: "Ok, got it!",
-<<<<<<< HEAD
                             customClass: { confirmButton: "btn btn-primary" }
-=======
-                            customClass: {confirmButton: "btn btn-primary"}
->>>>>>> 65399f816aeb801ace04e36b378a47806c904a11
                         })
                     })).then((() => {
                         e.removeAttribute("data-kt-indicator"), e.disabled = !1
@@ -62,11 +48,7 @@ var KTSigninGeneral = function () {
                         icon: "error",
                         buttonsStyling: !1,
                         confirmButtonText: "Ok, got it!",
-<<<<<<< HEAD
                         customClass: { confirmButton: "btn btn-primary" }
-=======
-                        customClass: {confirmButton: "btn btn-primary"}
->>>>>>> 65399f816aeb801ace04e36b378a47806c904a11
                     })
                 }))
             }))