# Conflicts: # jikimo_frontend/static/src/scss/custom_style.scss # sf_manufacturing/views/mrp_workcenter_views.xml