diff --git a/pms/views/reservation_portal_templates.xml b/pms/views/reservation_portal_templates.xml
index 866ff0497..bcd0c01cf 100644
--- a/pms/views/reservation_portal_templates.xml
+++ b/pms/views/reservation_portal_templates.xml
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 <?xml version="1.0" encoding="utf-8" ?>
+=======
+<?xml version="1.0" encoding="utf-8"?>
+>>>>>>> 9ae89adeafb12af5dbb27cdd270f5cf1fed9b2f1
 <odoo>
     <template
         id="portal_my_home_menu_reservation"