diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index a3a6d492f1..e17fb66436 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -9,8 +9,12 @@
   "dashboard_name",
   "is_default",
   "charts",
+<<<<<<< HEAD
   "default_chart_custom_options",
   "cards"
+=======
+  "chart_options"
+>>>>>>> fix: better naming
  ],
  "fields": [
   {
@@ -49,7 +53,7 @@
   }
  ],
  "links": [],
- "modified": "2020-04-28 14:17:02.391084",
+ "modified": "2020-04-29 13:26:37.362482",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",
diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index 952db21042..9368315343 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -22,8 +22,8 @@ def get_permitted_charts(dashboard_name):
 			chart_dict = frappe._dict()
 			chart_dict.update(chart.as_dict())
 
-			if dashboard.get('default_chart_custom_options'):
-				chart_dict.custom_options = dashboard.get('default_chart_custom_options')
+			if dashboard.get('chart_options'):
+				chart_dict.custom_options = dashboard.get('chart_options')
 			permitted_charts.append(chart_dict)
 
 	return permitted_charts
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 472d02a75e..3332534de6 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -219,7 +219,7 @@
    "options": "Dashboard Chart Field"
   },
   {
-   "description": " Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"] (the options set here will override the default custom options set in the Dashboard)",
+   "description": " Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"] (the options set here will override the chart options set in the Dashboard)",
    "fieldname": "custom_options",
    "fieldtype": "Code",
    "label": "Custom Options"