Index: shared/scripts/names.py
===================================================================
diff -u -r9a5aa28095bc06a0bb917f4b3abf75a5640f8b5a -r7bd88b4ce1c45659e15003ce15353eb3b80dd85c
--- shared/scripts/names.py	(.../names.py)	(revision 9a5aa28095bc06a0bb917f4b3abf75a5640f8b5a)
+++ shared/scripts/names.py	(.../names.py)	(revision 7bd88b4ce1c45659e15003ce15353eb3b80dd85c)
@@ -10,7 +10,6 @@
 o_Overlay    = {"container": o_QQuickView, "type": "Overlay"}
 o_Gui_MainView = {             "type": "Gui::MainView" }
 
-
 # Modal Dialog
 o_modalDialog           = {"container": o_Overlay     , "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True}
 o_treatmentHome                 = {"container": o_QQuickView   , "id": "_treatmentHome"      , "type": "TreatmentHome", "unnamed": 1, "visible": True}
@@ -1000,8 +999,12 @@
 device_settings_screen  = {"container": o_Gui_MainView, "text": "Treatment", "type": "Text", "unnamed": 1, "visible": True}
 o_SettingsHome_SettingsHome_2 = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True}
 o_SettingsHome_mouseArea_MouseArea_2 = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 7, "type": "MouseArea", "unnamed": 1, "visible": True}
+<<<<<<< HEAD
+o_SettingsHome_wifi_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "Wi-Fi", "type": "Text", "unnamed": 1, "visible": True}
+=======
 o_wifi_settings_main_button = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 3, "type": "MouseArea", "unnamed": 1, "visible": True}
 o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1, "visible": True}
+>>>>>>> 9a5aa28095bc06a0bb917f4b3abf75a5640f8b5a
 o_SettingsBase_SettingsWiFi = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsWiFi", "visible": True}
 o_SettingsBase_Wi_Fi_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Wi-Fi", "type": "Text", "unnamed": 1, "visible": True}
 o_SettingsBase_IP_Address_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "IP Address", "type": "Text", "unnamed": 1, "visible": True}
@@ -1034,6 +1037,7 @@
 o_back_button = {"container": o_Gui_MainView, "text": "BACK", "type": "Text", "unnamed": 1, "visible": False}
 o_dg_cleaning_back_button = {"container": o_SettingsBase_SettingsDG, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True}
 o_SettingsBase_SCAN_Text_2 = {"container": o_SettingsBase_SettingsBase, "text": "SCAN", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsBase_bluetooth_cuff_notification_text_one = {"container": o_SettingsBase_SettingsBase, "text": "The Bluetooth cuff pair clear error. [1001]", "type": "Text", "unnamed": 1, "visible": True}
 o_SettingsBase_mouseArea_MouseArea_4 = {"container": o_SettingsBase_SettingsBase, "id": "_mouseArea", "occurrence": 2, "type": "MouseArea", "unnamed": 1, "visible": True}
 o_SettingsBase_ssidText_Text = {"container": o_SettingsBase_SettingsWiFi, "id": "_ssidText", "type": "Text", "unnamed": 1, "visible": True}
 o_SettingsBase_input_TextInput = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True}