diff --git a/onlineTraining/yt-clipper.py b/onlineTraining/yt-clipper.py
index a28b681..de556ab 100755
--- a/onlineTraining/yt-clipper.py
+++ b/onlineTraining/yt-clipper.py
@@ -3,11 +3,8 @@
 import youtube_dl
 import json
 import ffmpeg
-<<<<<<< HEAD
 import subprocess
 import glob
-=======
->>>>>>> master
 
 #jsonFileName = "clips.json"
 jsonFileName = "***REMOVED***Kniebeuge.json"