diff --git a/xos/xos/settings.py b/xos/xos/settings.py
index ca0eced..bf2e1c2 100644
--- a/xos/xos/settings.py
+++ b/xos/xos/settings.py
@@ -148,11 +148,8 @@
     'core',
     'hpc',
     'cord',
-<<<<<<< HEAD
     'helloworldservice',
-=======
     'services.onos',
->>>>>>> e4243b659f2285c47cc71779238e142b156c88c0
     'ceilometer',
     'requestrouter',
 #    'urlfilter',