Resolve some left over merge conflicts

astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java

@@ -472,11 +472,4 @@ public class TagViewActivity extends TaskListActivity {
         ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items);
     }
 
-    @Override
-    protected void refresh() {
-        setUpMembersGallery();
-        loadTaskListContent(true);
-        ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items);
-    }
-
 }

astrid/src/com/todoroo/astrid/activity/TaskListActivity.java

@@ -636,7 +636,7 @@ public class TaskListActivity extends ListFragment implements OnScrollListener,
 
         if (!Preferences.getBoolean(WelcomeWalkthrough.KEY_SHOWED_WELCOME_LOGIN, false)) {
             Preferences.setBoolean(WelcomeWalkthrough.KEY_SHOWED_WELCOME_LOGIN, true);
-            Intent showWelcomeLogin = new Intent(this, WelcomeWalkthrough.class);
+            Intent showWelcomeLogin = new Intent(getActivity(), WelcomeWalkthrough.class);
             showWelcomeLogin.putExtra(ActFmLoginActivity.SHOW_TOAST, false);
             startActivity(showWelcomeLogin);
             return;