diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index 859ab57298..170d04a744 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -9,5 +9,9 @@
         'views/estate_property_views.xml',
         'views/estate_menus.xml',
     ],
-    'license': 'LGPL-3',
+    'license': "LGPL-3",
+    # data files containing optionally loaded demonstration data
+    'demo': [
+        "demo/demo.xml",
+    ],
 }
diff --git a/estate/demo/demo.xml b/estate/demo/demo.xml
new file mode 100644
index 0000000000..63025fadcb
--- /dev/null
+++ b/estate/demo/demo.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+        <record id="model_estate_property_action_cancel" model="ir.actions.server">
+            <field name="name">Mass cancel</field>
+            <field name="model_id" ref="estate.model_estate_property"/>
+            <field name="binding_model_id" ref="estate.model_estate_property"/>
+            <field name="binding_view_types">list</field>
+            <field name="state">code</field>
+            <field name="code">action = records.action_cancel()</field>
+        </record>
+    </data>
+</odoo>
diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py
index eba3d79d69..2c3e0c4ace 100644
--- a/estate/models/estate_property.py
+++ b/estate/models/estate_property.py
@@ -27,3 +27,17 @@ class EstateProperty(models.Model):
         string='State',
         selection=[('new', 'New'), ('offer_received', 'Offer Received'), ('offer_accepted', 'Offer Accepted'), ('sold', 'Sold'), ('cancelled', "Cancelled")]
     )
+<<<<<<< HEAD
+=======
+
+    property_type_id = fields.Many2one("estate.property.type", string="Property Type")
+    buyer_id = fields.Many2one("res.partner", string="Buyer", copy=False)
+    salesman_id = fields.Many2one("res.users", string="Salesman", default=lambda self: self.env.user)
+
+    tag_ids = fields.Many2many("estate.property.tag", string="Tags")
+
+    offer_ids = fields.One2many("estate.property.offer", "property_id", string="Offers")
+
+    def action_cancel(self):
+        pass
+>>>>>>> 8ba186df ([IMP] estate: Add a server action for better UX)