Fix merge conflicts

app/channel_test.go

@@ -1001,21 +1001,6 @@ func TestSearchChannelsForUser(t *testing.T) {
 	})
 }
 
-func TestGetNumberOfChannelsOnTeam(t *testing.T) {
-	th := Setup(t).InitBasic()
-	defer th.TearDown()
-
-	th.App.DeleteChannel(th.BasicChannel, th.BasicUser.Id)
-
-	count, err := th.App.GetNumberOfChannelsOnTeam(th.BasicTeam.Id, true)
-	require.Nil(t, err)
-	assert.Equal(t, 3, count)
-
-	count, err = th.App.GetNumberOfChannelsOnTeam(th.BasicTeam.Id, false)
-	require.Nil(t, err)
-	assert.Equal(t, 2, count)
-}
-
 func TestMarkChannelAsUnreadFromPost(t *testing.T) {
 	th := Setup(t).InitBasic()
 	defer th.TearDown()

app/post.go

@@ -1209,7 +1209,7 @@ func (a *App) countMentionsFromPost(user *model.User, post *model.Post) (int, *m
 	// A mapping of thread root IDs to whether or not a post in that thread mentions the user
 	mentionedByThread := make(map[string]bool)
 
-	thread, err := a.GetPostThread(post.Id)
+	thread, err := a.GetPostThread(post.Id, false)
 	if err != nil {
 		return 0, err
 	}