diff --git a/xos/core/models/service.py b/xos/core/models/service.py
index 0b75ce3..a9ce9f4 100644
--- a/xos/core/models/service.py
+++ b/xos/core/models/service.py
@@ -104,7 +104,6 @@
                 s.save()
 
                 # print "add sliver", s
->>>>>>> origin/master
 
 class ServiceAttribute(PlCoreBase):
     name = models.SlugField(help_text="Attribute Name", max_length=128)