diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js
index bcad86745..689157cca 100644
--- a/src/boot/qformMixin.js
+++ b/src/boot/qformMixin.js
@@ -20,6 +20,12 @@ export default {
                 if (firstInputElement) {
                     firstInputElement.focus();
                 }
+                const that = this;
+                document.addEventListener('keyup', function (evt) {
+                    if (evt.keyCode === 13) {
+                        that.onSubmit();
+                    }
+                });
             }
     },
 };
diff --git a/src/boot/setDefaults.js b/src/boot/setDefaults.js
deleted file mode 100644
index d54baa63e..000000000
--- a/src/boot/setDefaults.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { QInput, QSelect } from "quasar";
-import { QTable} from "quasar";
-const setDefault = (component, key, value) => {
-    const prop = component.props[key];
-    switch (typeof prop) {
-      case "object":
-        prop.default = value;
-        break;
-      case "function":
-        component.props[key] = {
-          type: prop,
-          default: value
-        };
-        break;
-      case "undefined":
-        throw new Error("unknown prop: " + key);
-      default:
-        throw new Error("unhandled type: " + typeof prop);
-    }
-  };
-
-QInput.props.outlined = {
-  type: QInput.props.outlined,
-  default: true
-};
-QInput.props.dense = {
-  type: QInput.props.dense,
-  default: true
-};
-QInput.props.stackLabel = {
-  type: QInput.props.stackLabel,
-  default: true
-};
-
-setDefault(QInput, "outlined", false);
-setDefault(QTable, "gridHeader", true);
-setDefault(QTable, "color", 'red-8');
-setDefault(QTable, "pagination", { rowsPerPage: 25 });
-setDefault(QTable, "rowKey", 'id');
-setDefault(QSelect,'optionValue','id');
-setDefault(QSelect,'optionLabel','name');
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index bca1a0018..96d097191 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -164,11 +164,7 @@ function formatValue(value) {
 </script>
 
 <template>
-<<<<<<< HEAD
-    <QForm @submit="search" @keyup.enter="search">
-=======
     <QForm @submit="search" id="filterPanelForm">
->>>>>>> a9f7cfb8d4acc624cee336bed47618e6d53c3476
         <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index c256cff61..504404f5a 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -250,22 +250,11 @@ const creditWarning = computed(() => {
                 />
             </QCard>
             <QCard class="vn-one" v-if="entity.account">
-<<<<<<< HEAD
-                <a
-                    class="header link"
-                    :href="`https://grafana.verdnatura.es/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
-                    link
-                >
-                    {{ t('customer.summary.financialData') }}
-                    <QIcon name="vn:grafana" color="primary" />
-                </a>
-=======
                 <VnTitle
                     :url="`https://grafana.verdnatura.es/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
                     :text="t('customer.summary.financialData')"
                     icon="vn:grafana"
                 />
->>>>>>> a9f7cfb8d4acc624cee336bed47618e6d53c3476
                 <VnLv
                     :label="t('customer.summary.risk')"
                     :value="toCurrency(entity?.debt?.debt)"