Actually fix merge conflicts.

lms/djangoapps/courseware/features/videoalpha.feature

-Feature: Video Alpha component
-  As a student, I want to view course videos in LMS.
-
-  Scenario: Autoplay is enabled in LMS
-    Given the course has a Video Alpha component
-    Then when I view the Video Alpha it has autoplay enabled

lms/djangoapps/courseware/features/videoalpha.py

-#pylint: disable=C0111
-#pylint: disable=W0613
-#pylint: disable=W0621
-
-from lettuce import world, step
-from lettuce.django import django_url
-from common import TEST_COURSE_NAME, TEST_SECTION_NAME, i_am_registered_for_the_course, section_location
-
-############### ACTIONS ####################
-
-
-@step('when I view the Video Alpha it has autoplay enabled')
-def does_autoplay(step):
-    assert(world.css_find('.videoalpha')[0]['data-autoplay'] == 'True')
-
-
-@step('the course has a Video Alpha component')
-def view_videoalpha(step):
-    coursename = TEST_COURSE_NAME.replace(' ', '_')
-    i_am_registered_for_the_course(step, coursename)
-
-    # Make sure we have a videoalpha
-    add_videoalpha_to_course(coursename)
-    chapter_name = TEST_SECTION_NAME.replace(" ", "_")
-    section_name = chapter_name
-    url = django_url('/courses/edx/Test_Course/Test_Course/courseware/%s/%s' %
-                     (chapter_name, section_name))
-
-    world.browser.visit(url)
-
-
-def add_videoalpha_to_course(course):
-    template_name = 'i4x://edx/templates/videoalpha/default'
-    world.ItemFactory.create(parent_location=section_location(course),
-                             template=template_name,
-                             display_name='Video Alpha 1')

lms/templates/video.html

@@ -2,49 +2,6 @@
   <h2> ${display_name} </h2>
 % endif
 
-<<<<<<< HEAD
-%if settings.MITX_FEATURES['STUB_VIDEO_FOR_TESTING']:
-  <div id="stub_out_video_for_testing">
-    <div class="video" data-autoplay="${settings.MITX_FEATURES['AUTOPLAY_VIDEOS']}">
-      <section class="video-controls">
-	<div class="slider"></div>
-	<div>
-	  <ul class="vcr">
-            <li><a class="video_control" href="#"></a></li>
-            <li>
-              <div class="vidtime">0:00 / 0:00</div>
-            </li>
-	  </ul>
-	  <div class="secondary-controls">
-            <a href="#" class="add-fullscreen" title="Fill browser">Fill Browser</a>
-	  </div>
-	</div>
-      </section>
-    </div>
-  </div>
-%elif settings.MITX_FEATURES.get('USE_YOUTUBE_OBJECT_API') and youtube_id_1_0:
-  <object width="640" height="390">
-    <param name="movie"
-           value="https://www.youtube.com/v/${youtube_id_1_0}?version=3&amp;autoplay=1&amp;rel=0"></param>
-    <param name="allowScriptAccess" value="always"></param>
-    <embed src="https://www.youtube.com/v/${youtube_id_1_0}?version=3&amp;autoplay=1&amp;rel=0"
-           type="application/x-shockwave-flash"
-           allowscriptaccess="always"
-           width="640" height="390"></embed>
-  </object>
-%else:
-  <div id="video_${id}"
-       class="video"
-       data-youtube-id-0-75="${youtube_id_0_75}"
-       data-youtube-id-1-0="${youtube_id_1_0}"
-       data-youtube-id-1-25="${youtube_id_1_25}"
-       data-youtube-id-1-5="${youtube_id_1_5}"
-       data-show-captions="${show_captions}"
-       data-start="${start}"
-       data-end="${end}"
-       data-caption-asset-path="${caption_asset_path}"
-       data-autoplay="${settings.MITX_FEATURES['AUTOPLAY_VIDEOS']}">
-=======
 %if settings.MITX_FEATURES.get('USE_YOUTUBE_OBJECT_API') and normal_speed_video_id:
   <object width="640" height="390">
     <param name="movie"
@@ -62,17 +19,17 @@
        width="640" height="390"></embed>
   </object>
 %else:
-<div id="video_${id}" class="video" 
-
-    % if not settings.MITX_FEATURES['STUB_VIDEO_FOR_TESTING']:
-    data-streams="${streams}" 
-    % endif
-
-    data-show-captions="${show_captions}" 
-    data-start="${start}" data-end="${end}" 
-    data-caption-asset-path="${caption_asset_path}" 
-    data-autoplay="${settings.MITX_FEATURES['AUTOPLAY_VIDEOS']}">
->>>>>>> master
+  <div id="video_${id}"
+       class="video"
+       data-youtube-id-0-75="${youtube_id_0_75}"
+       data-youtube-id-1-0="${youtube_id_1_0}"
+       data-youtube-id-1-25="${youtube_id_1_25}"
+       data-youtube-id-1-5="${youtube_id_1_5}"
+       data-show-captions="${show_captions}"
+       data-start="${start}"
+       data-end="${end}"
+       data-caption-asset-path="${caption_asset_path}"
+       data-autoplay="${settings.MITX_FEATURES['AUTOPLAY_VIDEOS']}">
     <div class="tc-wrapper">
       <article class="video-wrapper">
         <section class="video-player">