diff --git a/videojs/videojs-tests.ts b/videojs/videojs-tests.ts
index 7995339ac..37f8d5fda 100644
--- a/videojs/videojs-tests.ts
+++ b/videojs/videojs-tests.ts
@@ -1,6 +1,7 @@
 // Tests for Video.js API
 /// <reference path="videojs.d.ts" />
 
+<<<<<<< HEAD
 _V_("example_video_1").ready(function(){
 
 	var myPlayer:VideoJSPlayer = this;
@@ -71,4 +72,7 @@ _V_("example_video_1").ready(function(){
 	myPlayer.addEvent("volumechange", myFunc);
 	myPlayer.removeEvent("volumechange", myFunc);
 
-});
\ No newline at end of file
+});
+=======
+var myPlayer:VideoJSPlayer = _V_("example_video_1");
+>>>>>>> f8b142ba4c1a906b03601cd1f0d53484250f11b3
diff --git a/videojs/videojs.d.ts b/videojs/videojs.d.ts
index 49fb1c09a..17834c22e 100644
--- a/videojs/videojs.d.ts
+++ b/videojs/videojs.d.ts
@@ -26,7 +26,10 @@ interface VideoJSPlayer {
 	src(newSource: VideoJSSource): VideoJSPlayer;
 	src(newSource: VideoJSSource[]): VideoJSPlayer;
 	currentTime(seconds: number): VideoJSPlayer;
+<<<<<<< HEAD
 	currentTime(): number;
+=======
+>>>>>>> f8b142ba4c1a906b03601cd1f0d53484250f11b3
 	duration(): number;
 	buffered(): TimeRanges;
 	bufferedPercent(): number;