diff --git a/src/gs-details-page.c b/src/gs-details-page.c
index 30b79642023327a0280f32bfe7021d9a7bc6891d..64de7614b7c5a46f08a3781a761bc69f2743d5d8 100644
--- a/src/gs-details-page.c
+++ b/src/gs-details-page.c
@@ -1895,8 +1895,28 @@ gs_details_page_url_to_app_cb (GObject *source,
 void
 gs_details_page_set_local_file (GsDetailsPage *self, GFile *file)
 {
+	const gchar *str = NULL;
 	g_autoptr(GsPluginJob) plugin_job = NULL;
 	gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING);
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> a3354bd3528982e6b62c1e4f304bbd5bb13a3dc5
+	str = _("Loading details");
+=======
+	if(gs_details_page_set_state == GS_DETAILS_PAGE_STATE_LOADING) {
+		str = _("Loading details");
+	}
+>>>>>>> f8dd43d5... Update src/gs-details-page.c
+<<<<<<< HEAD
+=======
+=======
+	if(gs_details_page_set_state == GS_DETAILS_PAGE_STATE_LOADING) {
+		str = _("Loading details");
+	}
+>>>>>>> f8dd43d5910e56864cebbdb5f71c7e91600f1682
+>>>>>>> a3354bd3528982e6b62c1e4f304bbd5bb13a3dc5
 	g_clear_object (&self->app_local_file);
 	plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_FILE_TO_APP,
 					 "file", file,
@@ -1928,8 +1948,28 @@ gs_details_page_set_local_file (GsDetailsPage *self, GFile *file)
 void
 gs_details_page_set_url (GsDetailsPage *self, const gchar *url)
 {
+	const gchar *str = NULL;
 	g_autoptr(GsPluginJob) plugin_job = NULL;
 	gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING);
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> a3354bd3528982e6b62c1e4f304bbd5bb13a3dc5
+	str = _("Loading details");
+=======
+	if(gs_details_page_set_state == GS_DETAILS_PAGE_STATE_LOADING) {
+		str = _("Loading details");
+	}
+>>>>>>> f8dd43d5... Update src/gs-details-page.c
+<<<<<<< HEAD
+=======
+=======
+	if(gs_details_page_set_state == GS_DETAILS_PAGE_STATE_LOADING) {
+		str = _("Loading details");
+	}
+>>>>>>> f8dd43d5910e56864cebbdb5f71c7e91600f1682
+>>>>>>> a3354bd3528982e6b62c1e4f304bbd5bb13a3dc5
 	g_clear_object (&self->app_local_file);
 	plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_URL_TO_APP,
 					 "search", url,
@@ -1963,12 +2003,37 @@ gs_details_page_set_url (GsDetailsPage *self, const gchar *url)
 static void
 gs_details_page_load_stage1 (GsDetailsPage *self)
 {
+	const gchar *str = NULL;
 	g_autoptr(GsPluginJob) plugin_job = NULL;
 
 	/* update UI */
 	gs_page_switch_to (GS_PAGE (self), TRUE);
 	gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING);
-
+<<<<<<< HEAD
+<<<<<<< HEAD
+	str = _("Loading details");
+
+=======
+=======
+<<<<<<< HEAD
+	str = _("Loading details");
+
+=======
+=======
+>>>>>>> f8dd43d5910e56864cebbdb5f71c7e91600f1682
+>>>>>>> a3354bd3528982e6b62c1e4f304bbd5bb13a3dc5
+	if(gs_details_page_set_state == GS_DETAILS_PAGE_STATE_LOADING) {
+			str = _("Loading details");
+	}
+	
+<<<<<<< HEAD
+>>>>>>> f8dd43d5... Update src/gs-details-page.c
+=======
+<<<<<<< HEAD
+>>>>>>> f8dd43d5... Update src/gs-details-page.c
+=======
+>>>>>>> f8dd43d5910e56864cebbdb5f71c7e91600f1682
+>>>>>>> a3354bd3528982e6b62c1e4f304bbd5bb13a3dc5
 	/* get extra details about the app */
 	plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_REFINE,
 					 "app", self->app,