diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py
index 8e1f83370..71bdefb77 100755
--- a/admin/mac/macdeploy.py
+++ b/admin/mac/macdeploy.py
@@ -1,5 +1,4 @@
 #!/usr/bin/python
-<<<<<<< HEAD
 #  This file is part of Tomahawk. 
 #  It was inspired in large part by the macdeploy script in Clementine.
 #