diff --git a/addons/project/models/project_update.py b/addons/project/models/project_update.py
index ebcc9ff62ac..e09d300f290 100644
--- a/addons/project/models/project_update.py
+++ b/addons/project/models/project_update.py
@@ -13,6 +13,7 @@ STATUS_COLOR = {
     'at_risk': 2,  # orange
     'off_track': 23,  # red / danger
     'on_hold': 4,  # light blue
+    False: 0,  # default grey -- for studio
 }
 
 class ProjectUpdate(models.Model):
diff --git a/addons/sale_timesheet/static/src/xml/sale_project_templates.xml b/addons/sale_timesheet/static/src/xml/sale_project_templates.xml
index 5cc7f846b14..61942aaa97a 100644
--- a/addons/sale_timesheet/static/src/xml/sale_project_templates.xml
+++ b/addons/sale_timesheet/static/src/xml/sale_project_templates.xml
@@ -62,11 +62,7 @@
     </t>
     
     <t t-name="sale_timesheet.ProfitabilitySection" owl="1">
-<<<<<<< HEAD
-        <t t-if="state.data.user.is_project_user &amp;&amp; state.data.profitability_items.data.length > 0">
-=======
-        <t t-if="state.data.user.is_project_manager &amp;&amp; state.data.analytic_account_id &amp;&amp; state.data.profitability_items.data.length > 0">
->>>>>>> [IMP] sale_timesheet: remove overview and improve updates
+        <t t-if="state.data.user.is_project_user &amp;&amp; state.data.profitability_items.data.length > 0 &amp;&amp; state.data.analytic_account_id">
             <t t-set="profitability_items" t-value="state.data.profitability_items"/>
             <div name="profitability" class="o_rightpanel_section">
                 <div class="o_rightpanel_header">