diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5eb50a06f2..09309b5cf9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -13,8 +13,12 @@ instance, Boolean, Integer, String), but also allow them to hold either the
 typed value, or a String that can be converted to their typed value. For example,
 an Integer can contain 3 or '3'. This changed an update to the xblock library.
 
+<<<<<<< HEAD
 LMS: Courses whose id matches a regex in the COURSES_WITH_UNSAFE_CODE Django
 setting now run entirely outside the Python sandbox.
+=======
+Blades: Added tests for Video Alpha player.
+>>>>>>> 812be7a... Added comment about enabling some Video Alpha tests when testing locally. Updated CHANGELOG.
 
 Blades: Video Alpha bug fix for speed changing to 1.0 in Firefox.
 
diff --git a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/html5_video.coffee b/common/lib/xmodule/xmodule/js/spec/videoalpha/display/html5_video.coffee
index ba8bd18dde..176ceb7827 100644
--- a/common/lib/xmodule/xmodule/js/spec/videoalpha/display/html5_video.coffee
+++ b/common/lib/xmodule/xmodule/js/spec/videoalpha/display/html5_video.coffee
@@ -52,6 +52,16 @@ describe 'VideoAlpha HTML5Video', ->
     it 'check if click event is handled on the player', ->
         expect(@videoEl).toHandle 'click'
 
+  # NOTE: According to
+  #
+  # https://github.com/ariya/phantomjs/wiki/Supported-Web-Standards#unsupported-features
+  #
+  # Video and Audio (due to the nature of PhantomJS) are not supported. After discussion
+  # with William Daly, some tests are disabled (Jenkins uses phantomjs for running tests
+  # and those tests fail).
+  #
+  # During code review, please enable the test below (change "xdescribe" to "describe"
+  # to enable the test).
   xdescribe 'events:', ->
 
     beforeEach ->
@@ -201,6 +211,16 @@ describe 'VideoAlpha HTML5Video', ->
           jasmine.fireEvent @videoEl, "timeupdate"
           expect(@player.end).toBe @videoEl.duration
 
+  # NOTE: According to
+  #
+  # https://github.com/ariya/phantomjs/wiki/Supported-Web-Standards#unsupported-features
+  #
+  # Video and Audio (due to the nature of PhantomJS) are not supported. After discussion
+  # with William Daly, some tests are disabled (Jenkins uses phantomjs for running tests
+  # and those tests fail).
+  #
+  # During code review, please enable the test below (change "xdescribe" to "describe"
+  # to enable the test).
   xdescribe 'methods:', ->
 
     beforeEach ->