diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py
index 2c4c218ba5..c9fdda7a2e 100644
--- a/lms/djangoapps/django_comment_client/forum/views.py
+++ b/lms/djangoapps/django_comment_client/forum/views.py
@@ -239,10 +239,6 @@ def forum_form_discussion(request, course_id):
             'is_course_cohorted': is_course_cohorted(course_id)
         }
         # print "start rendering.."
-<<<<<<< Updated upstream
-
-=======
->>>>>>> Stashed changes
         return render_to_response('discussion/index.html', context)
 
 @login_required