diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 9d085e5aa..602ecbca2 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -13,17 +13,10 @@ jobs:
   pre-commit:
     runs-on: ubuntu-22.04
     steps:
-<<<<<<< before updating
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-=======
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v2
         with:
           python-version: "3.11"
->>>>>>> after updating
       - name: Get python version
         run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
       - uses: actions/cache@v1
diff --git a/.github/workflows/stale.yml.rej b/.github/workflows/stale.yml.rej
deleted file mode 100644
index f41569091..000000000
--- a/.github/workflows/stale.yml.rej
+++ /dev/null
@@ -1,9 +0,0 @@
-diff a/.github/workflows/stale.yml b/.github/workflows/stale.yml	(rejected hunks)
-@@ -15,2 +15,3 @@ jobs:
-           # General settings.
-+          ascending: true
-           remove-stale-when-updated: true
-@@ -52,2 +53,3 @@ jobs:
-           repo-token: ${{ secrets.GITHUB_TOKEN }}
-+          ascending: true
-           only-labels: "needs more information"
diff --git a/support_branding/demo/ir_config_parameter_data.xml b/support_branding/demo/ir_config_parameter_data.xml
index ef9bf9417..4ec7d4b06 100644
--- a/support_branding/demo/ir_config_parameter_data.xml
+++ b/support_branding/demo/ir_config_parameter_data.xml
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <data noupdate="0">
-        <record id="demo_config_parameter_company_name" model="ir.config_parameter">
-            <field name="key">support_company</field>
-            <field name="value">Odoo Community Association</field>
-        </record>
-        <record id="demo_config_parameter_company_url" model="ir.config_parameter">
-            <field name="key">support_company_url</field>
-            <field name="value">https://odoo-community.org</field>
-        </record>
-        <record id="demo_config_parameter_company_color" model="ir.config_parameter">
-            <field name="key">support_branding_color</field>
-            <field name="value">#fff</field>
-        </record>
-        <record id="demo_config_parameter_support_email" model="ir.config_parameter">
-            <field name="key">support_email</field>
-            <field name="value">oca@example.com</field>
-        </record>
-        <record id="demo_config_parameter_release" model="ir.config_parameter">
-            <field name="key">support_release</field>
-            <field name="value">14.0</field>
-        </record>
-    </data>
+    <record id="demo_config_parameter_company_name" model="ir.config_parameter">
+        <field name="key">support_company</field>
+        <field name="value">Odoo Community Association</field>
+    </record>
+    <record id="demo_config_parameter_company_url" model="ir.config_parameter">
+        <field name="key">support_company_url</field>
+        <field name="value">https://odoo-community.org</field>
+    </record>
+    <record id="demo_config_parameter_company_color" model="ir.config_parameter">
+        <field name="key">support_branding_color</field>
+        <field name="value">#fff</field>
+    </record>
+    <record id="demo_config_parameter_support_email" model="ir.config_parameter">
+        <field name="key">support_email</field>
+        <field name="value">oca@example.com</field>
+    </record>
+    <record id="demo_config_parameter_release" model="ir.config_parameter">
+        <field name="key">support_release</field>
+        <field name="value">14.0</field>
+    </record>
 </odoo>
diff --git a/web_create_write_confirm/views/assets.xml b/web_create_write_confirm/views/assets.xml
index 6aec517eb..57605f94a 100644
--- a/web_create_write_confirm/views/assets.xml
+++ b/web_create_write_confirm/views/assets.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
 
-        <template id="assets_backend_extension" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <script
-                    type="text/javascript"
-                    src="/web_create_write_confirm/static/src/js/pop_up_confirmation.js"
-                />
-            </xpath>
-        </template>
+    <template id="assets_backend_extension" inherit_id="web.assets_backend">
+        <xpath expr="." position="inside">
+            <script
+                type="text/javascript"
+                src="/web_create_write_confirm/static/src/js/pop_up_confirmation.js"
+            />
+        </xpath>
+    </template>
 
-    </data>
 </odoo>
diff --git a/web_create_write_confirm/views/popup_message.xml b/web_create_write_confirm/views/popup_message.xml
index f04d112c3..7b413b05c 100644
--- a/web_create_write_confirm/views/popup_message.xml
+++ b/web_create_write_confirm/views/popup_message.xml
@@ -1,78 +1,76 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
 
-        <record id="view_popup_message_tree" model="ir.ui.view">
-            <field name="name">view.popup.message.tree</field>
-            <field name="model">popup.message</field>
-            <field name="arch" type="xml">
-                <tree string="Popup Message">
-                    <field name="model_id" />
-                    <field name="field_ids" widget="many2many_tags" />
-                    <field name="popup_type" />
-                    <field name="title" />
-                    <field name="message" />
-                    <field name="active" />
-                </tree>
-            </field>
-        </record>
+    <record id="view_popup_message_tree" model="ir.ui.view">
+        <field name="name">view.popup.message.tree</field>
+        <field name="model">popup.message</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="model_id" />
+                <field name="field_ids" widget="many2many_tags" />
+                <field name="popup_type" />
+                <field name="title" />
+                <field name="message" />
+                <field name="active" />
+            </tree>
+        </field>
+    </record>
 
-        <record id="view_popup_message_form" model="ir.ui.view">
-            <field name="name">view.popup.message.form</field>
-            <field name="model">popup.message</field>
-            <field name="arch" type="xml">
-                <form string="Popup Message">
-                    <sheet>
-                        <widget
-                            name="web_ribbon"
-                            title="Archived"
-                            bg_color="bg-danger"
-                            attrs="{'invisible': [('active', '=', True)]}"
+    <record id="view_popup_message_form" model="ir.ui.view">
+        <field name="name">view.popup.message.form</field>
+        <field name="model">popup.message</field>
+        <field name="arch" type="xml">
+            <form string="Popup Message">
+                <sheet>
+                    <widget
+                        name="web_ribbon"
+                        title="Archived"
+                        bg_color="bg-danger"
+                        attrs="{'invisible': [('active', '=', True)]}"
+                    />
+                    <group>
+                        <field name="model_id" />
+                        <field name="model" invisible="1" />
+                        <field
+                            name="field_ids"
+                            domain="[('model','=',model)]"
+                            widget="many2many_tags"
                         />
-                        <group>
-                            <field name="model_id" />
-                            <field name="model" invisible="1" />
-                            <field
-                                name="field_ids"
-                                domain="[('model','=',model)]"
-                                widget="many2many_tags"
-                            />
-                            <field name="popup_type" />
-                            <field name="title" />
-                            <field name="message" />
-                            <field name="active" widget="boolean_toggle" />
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
+                        <field name="popup_type" />
+                        <field name="title" />
+                        <field name="message" />
+                        <field name="active" widget="boolean_toggle" />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
 
-        <record id="action_popup_message_view" model="ir.actions.act_window">
-            <field name="name">Popup message</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">popup.message</field>
-            <field name="view_mode">tree,form</field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Add your pop-up!
-                </p>
-            </field>
-        </record>
+    <record id="action_popup_message_view" model="ir.actions.act_window">
+        <field name="name">Popup message</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">popup.message</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+                Add your pop-up!
+            </p>
+        </field>
+    </record>
 
-        <menuitem
-            id="menu_popup_message_categ"
-            name="Popup message"
-            parent="base.menu_custom"
-            sequence="90"
-        />
+    <menuitem
+        id="menu_popup_message_categ"
+        name="Popup message"
+        parent="base.menu_custom"
+        sequence="90"
+    />
 
-        <menuitem
-            id="menu_popup_message_view"
-            name="Popup message"
-            parent="web_create_write_confirm.menu_popup_message_categ"
-            action="action_popup_message_view"
-            sequence="10"
-        />
+    <menuitem
+        id="menu_popup_message_view"
+        name="Popup message"
+        parent="web_create_write_confirm.menu_popup_message_categ"
+        action="action_popup_message_view"
+        sequence="10"
+    />
 
-    </data>
 </odoo>
diff --git a/web_field_required_invisible_manager/views/views.xml b/web_field_required_invisible_manager/views/views.xml
index cfe6c90d1..36965c139 100644
--- a/web_field_required_invisible_manager/views/views.xml
+++ b/web_field_required_invisible_manager/views/views.xml
@@ -15,7 +15,7 @@
                         nolabel="1"
                         context="{'default_required_model_id': model}"
                     >
-                        <tree string="Fields">
+                        <tree>
                             <field name="required_model_id" invisible="1" />
                             <field name="invisible_model_id" invisible="1" />
                             <field name="model_name" invisible="1" />
@@ -45,7 +45,7 @@
                         nolabel="1"
                         context="{'default_invisible_model_id': model}"
                     >
-                        <tree string="Fields">
+                        <tree>
                             <field name="required_model_id" invisible="1" />
                             <field name="invisible_model_id" invisible="1" />
                             <field name="model_name" invisible="1" />
@@ -72,7 +72,7 @@
                         nolabel="1"
                         context="{'default_readonly_model_id': model}"
                     >
-                        <tree string="Fields">
+                        <tree>
                             <field name="required_model_id" invisible="1" />
                             <field name="invisible_model_id" invisible="1" />
                             <field name="readonly_model_id" invisible="1" />
diff --git a/web_m2x_options_manager/views/ir_model.xml b/web_m2x_options_manager/views/ir_model.xml
index f0e6502d4..e52a1b864 100644
--- a/web_m2x_options_manager/views/ir_model.xml
+++ b/web_m2x_options_manager/views/ir_model.xml
@@ -17,7 +17,7 @@
                         nolabel="1"
                         context="{'default_model_name': model}"
                     >
-                        <tree string="Fields Description" editable="bottom">
+                        <tree editable="bottom">
                             <field name="model_name" invisible="1" />
                             <field
                                 name="field_id"
diff --git a/web_no_bubble/views/web_no_bubble.xml b/web_no_bubble/views/web_no_bubble.xml
index 164d0160c..4ebe5512f 100644
--- a/web_no_bubble/views/web_no_bubble.xml
+++ b/web_no_bubble/views/web_no_bubble.xml
@@ -1,29 +1,27 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
-        <template
-            id="assets_backend"
-            name="web_no_bubble_assets"
-            inherit_id="web.assets_backend"
-        >
-            <xpath expr="." position="inside">
-                <link
-                    rel="stylesheet"
-                    href="/web_no_bubble/static/src/css/web_no_bubble.scss"
-                />
-            </xpath>
-        </template>
-        <template
-            id="assets_frontend"
-            name="web_no_bubble_assets_frontend"
-            inherit_id="web.assets_frontend"
-        >
-            <xpath expr="." position="inside">
-                <link
-                    rel="stylesheet"
-                    href="/web_no_bubble/static/src/css/web_no_bubble.scss"
-                />
-            </xpath>
-        </template>
-    </data>
+    <template
+        id="assets_backend"
+        name="web_no_bubble_assets"
+        inherit_id="web.assets_backend"
+    >
+        <xpath expr="." position="inside">
+            <link
+                rel="stylesheet"
+                href="/web_no_bubble/static/src/css/web_no_bubble.scss"
+            />
+        </xpath>
+    </template>
+    <template
+        id="assets_frontend"
+        name="web_no_bubble_assets_frontend"
+        inherit_id="web.assets_frontend"
+    >
+        <xpath expr="." position="inside">
+            <link
+                rel="stylesheet"
+                href="/web_no_bubble/static/src/css/web_no_bubble.scss"
+            />
+        </xpath>
+    </template>
 </odoo>
diff --git a/web_pwa_oca/views/res_config_settings_views.xml b/web_pwa_oca/views/res_config_settings_views.xml
index 4aebad5a0..45156c5b8 100644
--- a/web_pwa_oca/views/res_config_settings_views.xml
+++ b/web_pwa_oca/views/res_config_settings_views.xml
@@ -1,72 +1,67 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
-        <record id="res_config_settings_view_form" model="ir.ui.view">
-            <field name="name">res.config.settings.view.form.pwa</field>
-            <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="base_setup.res_config_settings_view_form" />
-            <field name="arch" type="xml">
-                <div id="emails" position='after'>
-                    <h2>Progressive Web App</h2>
-                    <div class="row mt16 o_settings_container" id="pwa_settings">
-                        <div class="col-12 col-lg-6 o_setting_box" id="domain_setting">
-                            <div class="o_setting_right_pane">
-                                <label for="pwa_name" string="PWA Title" />
-                                <span
-                                    class="fa fa-lg fa-globe"
-                                    title="Icon next to name"
-                                />
-                                <div class="text-muted">
-                                    Name and icon of your PWA
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.pwa</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="base_setup.res_config_settings_view_form" />
+        <field name="arch" type="xml">
+            <div id="emails" position='after'>
+                <h2>Progressive Web App</h2>
+                <div class="row mt16 o_settings_container" id="pwa_settings">
+                    <div class="col-12 col-lg-6 o_setting_box" id="domain_setting">
+                        <div class="o_setting_right_pane">
+                            <label for="pwa_name" string="PWA Title" />
+                            <span class="fa fa-lg fa-globe" title="Icon next to name" />
+                            <div class="text-muted">
+                                Name and icon of your PWA
+                            </div>
+                            <div class="content-group">
+                                <div class="row mt16">
+                                    <label
+                                        class="col-lg-3 o_light_label"
+                                        string="Name"
+                                        for="pwa_name"
+                                    />
+                                    <field name="pwa_name" />
                                 </div>
-                                <div class="content-group">
-                                    <div class="row mt16">
-                                        <label
-                                            class="col-lg-3 o_light_label"
-                                            string="Name"
-                                            for="pwa_name"
-                                        />
-                                        <field name="pwa_name" />
-                                    </div>
-                                    <div class="row mt16">
-                                        <label
-                                            class="col-lg-3 o_light_label"
-                                            string="Short Name"
-                                            for="pwa_short_name"
-                                        />
-                                        <field name="pwa_short_name" />
-                                    </div>
-                                    <div class="row">
-                                        <label
-                                            class="col-lg-3 o_light_label"
-                                            for="pwa_background_color"
-                                        />
-                                        <field name="pwa_background_color" />
-                                    </div>
-                                    <div class="row">
-                                        <label
-                                            class="col-lg-3 o_light_label"
-                                            for="pwa_theme_color"
-                                        />
-                                        <field name="pwa_theme_color" />
-                                    </div>
-                                    <div class="row">
-                                        <label
-                                            class="col-lg-3 o_light_label"
-                                            for="pwa_icon"
-                                        />
-                                        <field
-                                            name="pwa_icon"
-                                            widget="image"
-                                            class="float-left oe_avatar"
-                                        />
-                                    </div>
+                                <div class="row mt16">
+                                    <label
+                                        class="col-lg-3 o_light_label"
+                                        string="Short Name"
+                                        for="pwa_short_name"
+                                    />
+                                    <field name="pwa_short_name" />
+                                </div>
+                                <div class="row">
+                                    <label
+                                        class="col-lg-3 o_light_label"
+                                        for="pwa_background_color"
+                                    />
+                                    <field name="pwa_background_color" />
+                                </div>
+                                <div class="row">
+                                    <label
+                                        class="col-lg-3 o_light_label"
+                                        for="pwa_theme_color"
+                                    />
+                                    <field name="pwa_theme_color" />
+                                </div>
+                                <div class="row">
+                                    <label
+                                        class="col-lg-3 o_light_label"
+                                        for="pwa_icon"
+                                    />
+                                    <field
+                                        name="pwa_icon"
+                                        widget="image"
+                                        class="float-left oe_avatar"
+                                    />
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
-            </field>
-        </record>
-    </data>
+            </div>
+        </field>
+    </record>
 </odoo>
diff --git a/web_switch_context_warning/view/view.xml b/web_switch_context_warning/view/view.xml
index 35c5714bc..550ad2b2e 100644
--- a/web_switch_context_warning/view/view.xml
+++ b/web_switch_context_warning/view/view.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<openerp>
-    <data>
-        <template
-            id="assets_backend"
-            name="web_switch_context_warning assets"
-            inherit_id="web.assets_backend"
-        >
-            <xpath expr="." position="inside">
-                <script
-                    type="text/javascript"
-                    src="/web_switch_context_warning/static/src/js/switch_context_warning.js"
-                />
-            </xpath>
-        </template>
-    </data>
-</openerp>
+<odoo>
+    <template
+        id="assets_backend"
+        name="web_switch_context_warning assets"
+        inherit_id="web.assets_backend"
+    >
+        <xpath expr="." position="inside">
+            <script
+                type="text/javascript"
+                src="/web_switch_context_warning/static/src/js/switch_context_warning.js"
+            />
+        </xpath>
+    </template>
+</odoo>