diff --git a/mod/filerm.php b/mod/filerm.php
index 7662289ad2..7dbfe29473 100644
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -22,14 +22,9 @@ 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 368619dec4..69b7f3a601 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -90,7 +90,10 @@ function subthread_content(App &$a) {
 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
 =======
 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
+<<<<<<< upstream/develop
 >>>>>>> HEAD~33
+=======
+>>>>>>> HEAD~32
 	$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 	$body = $item['body'];