Index: shared/scripts/names.py
===================================================================
diff -u -r7bd88b4ce1c45659e15003ce15353eb3b80dd85c -r95161cc187f2e95a349fb9bef583a376d5be58d3
--- shared/scripts/names.py	(.../names.py)	(revision 7bd88b4ce1c45659e15003ce15353eb3b80dd85c)
+++ shared/scripts/names.py	(.../names.py)	(revision 95161cc187f2e95a349fb9bef583a376d5be58d3)
@@ -999,12 +999,8 @@
 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}