fix merge conflicts

AUTHORS

@@ -25,6 +25,3 @@ Bill DeRusha <bill@edx.org>
 Brian Beggs <macdiesel@gmail.com>
 Clinton Blackburn <cblackburn@edx.org>
 Eugeny Kolpakov <eugeny.kolpakov@gmail.com>
-Ben McMorran <ben.mcmorran@gmail.com>
-Bill DeRusha <bill@edx.org>
-Eugeny Kolpakov <eugeny.kolpakov@gmail.com>

spec/api/comment_thread_spec.rb

@@ -574,6 +574,31 @@ describe "app" do
         json_response["read"].should == true
       end
 
+      # Test active and non active thread count for a course
+      it "test the number of active and non active threads for a course" do
+        User.all.delete
+        Content.all.delete
+        @user = create_test_user(999)
+        @threads = {}
+        5.times do |n|
+          thread_key = "t#{n}"
+          thread = make_thread(@user, thread_key, DFLT_COURSE_ID, "pdq")
+          @threads[n] = thread
+        end
+        time_threshold = 2.day.ago
+        @threads[0].last_activity_at = time_threshold
+        @threads[0].save!
+        @threads[1].last_activity_at = time_threshold
+        @threads[1].save!
+
+        get "/api/v1/courses/#{DFLT_COURSE_ID}/stats"
+        last_response.should be_ok
+        response = parse last_response.body
+        response["num_threads"].should == 5
+        response["num_active_threads"].should == 3
+      end
+
+
       def test_unicode_data(text)
         thread = create(:comment_thread, body: text)
         create(:comment, comment_thread: thread, body: text)