diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h
index b54fbbe7a8..8875097215 100644
--- a/src/settings/nm-settings-connection.h
+++ b/src/settings/nm-settings-connection.h
@@ -46,17 +46,11 @@ G_BEGIN_DECLS
 #define NM_SETTINGS_CONNECTION_UPDATED_BY_USER "updated-by-user"
 
 /* Properties */
-<<<<<<< HEAD
-#define NM_SETTINGS_CONNECTION_VISIBLE "visible"
-#define NM_SETTINGS_CONNECTION_UNSAVED "unsaved"
-#define NM_SETTINGS_CONNECTION_READY   "ready"
-#define NM_SETTINGS_CONNECTION_FLAGS   "flags"
-=======
 #define NM_SETTINGS_CONNECTION_VISIBLE  "visible"
 #define NM_SETTINGS_CONNECTION_UNSAVED  "unsaved"
+#define NM_SETTINGS_CONNECTION_READY    "ready"
 #define NM_SETTINGS_CONNECTION_FLAGS    "flags"
 #define NM_SETTINGS_CONNECTION_FILENAME "filename"
->>>>>>> settings: add NMSettingsConnection:filename
 
 
 /**
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
index 32ef72af79..014f69e44a 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
+++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
@@ -156,7 +156,7 @@ nm_ifcfg_connection_check_devtimeout (NMIfcfgConnection *self)
 	ifname = nm_setting_connection_get_interface_name (s_con);
 	if (!ifname)
 		return;
-	devtimeout = devtimeout_from_file (nm_ifcfg_connection_get_path (self));
+	devtimeout = devtimeout_from_file (nm_settings_connection_get_filename (NM_SETTINGS_CONNECTION (self)));
 	if (!devtimeout)
 		return;