diff --git a/mod/filerm.php b/mod/filerm.php
index 7dbfe2947..7662289ad 100644
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -22,9 +22,14 @@ function filerm_content(App &$a) {
 		file_tag_unsave_file(local_user(),$item_id,$term, $category);
 	}
 
+<<<<<<< upstream/develop
 	if (x($_SESSION,'return_url')) {
 		goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
 	}
+=======
+	if(x($_SESSION,'return_url'))
+		goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
+>>>>>>> HEAD~33
 
 	killme();
 }
diff --git a/mod/subthread.php b/mod/subthread.php
index c689f7f6c..368619dec 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -86,7 +86,11 @@ function subthread_content(App &$a) {
 	$uri = item_new_uri($a->get_hostname(),$owner_uid);
 
 	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
+<<<<<<< upstream/develop
 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
+=======
+	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
+>>>>>>> HEAD~33
 	$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 	$body = $item['body'];