diff --git a/xos/configurations/common/mydeployment.yaml b/xos/configurations/common/mydeployment.yaml
index 66bb75d..c81fd93 100644
--- a/xos/configurations/common/mydeployment.yaml
+++ b/xos/configurations/common/mydeployment.yaml
@@ -16,9 +16,15 @@
     m1.small:
       type: tosca.nodes.Flavor
 
+    m1.xlarge:
+      type: tosca.nodes.Flavor
+
     MyDeployment:
       type: tosca.nodes.Deployment
       requirements:
+          - m1.xlarge:
+             node: m1.large
+             relationship: tosca.relationships.SupportsFlavor
           - m1.large:
              node: m1.large
              relationship: tosca.relationships.SupportsFlavor
diff --git a/xos/configurations/frontend/Makefile b/xos/configurations/frontend/Makefile
index a8cb042..6841c97 100644
--- a/xos/configurations/frontend/Makefile
+++ b/xos/configurations/frontend/Makefile
@@ -4,12 +4,9 @@
 	sudo make -f ../common/Makefile.prereqs
 	sudo docker-compose up -d
 	bash ../common/wait_for_xos.sh
-<<<<<<< HEAD
 	# bash ../mcord/xos/initdb
-=======
 	sudo docker-compose run xos python /opt/xos/tosca/run.py none /opt/xos/configurations/common/fixtures.yaml
 	sudo docker-compose run xos python /opt/xos/tosca/run.py none /opt/xos/configurations/common/mydeployment.yaml
->>>>>>> upstream/master
 	sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/frontend/sample.yaml
 	# sudo docker-compose run xos python manage.py makemigrations mcordservice
 	# sudo docker-compose run xos python manage.py syncdb
diff --git a/xos/configurations/mcord/Makefile b/xos/configurations/mcord/Makefile
index 30fced6..7f4d9a5 100644
--- a/xos/configurations/mcord/Makefile
+++ b/xos/configurations/mcord/Makefile
@@ -2,8 +2,9 @@
 xos: nodes.yaml images.yaml
 	sudo docker-compose up -d
 	../common/wait_for_xos_port.sh 8000
-	sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/common/fixtures.yaml
-	sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/setup.yaml
+	sudo docker-compose run xos python /opt/xos/tosca/run.py none /opt/xos/configurations/common/fixtures.yaml
+	sudo docker-compose run xos python /opt/xos/tosca/run.py none /opt/xos/configurations/common/mydeployment.yaml
+	sudo docker-compose run xos python /opt/xos/tosca/run.py none /root/setup/setup.yaml
 	sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/nodes.yaml
 	sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/images.yaml
 	sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/mgmt-net.yaml
diff --git a/xos/configurations/mcord/mcord.yaml b/xos/configurations/mcord/mcord.yaml
index a55b58f..42241f0 100644
--- a/xos/configurations/mcord/mcord.yaml
+++ b/xos/configurations/mcord/mcord.yaml
@@ -74,17 +74,17 @@
             s1u_tag:
                 type: string
                 required: false
-                default: 201
+                default: 901
                 description: VTN stag port-name
             s1mme_tag:
                 type: string
                 required: false
-                default: 200
+                default: 900
                 description: VTN stag port-name
             rru_tag:
                 type: string
                 required: false
-                default: 199 
+                default: 999 
                 description: VTN stag port-name
             display_message:
                 type: string
@@ -107,6 +107,8 @@
       artifacts:
           pubkey: /opt/xos/configurations/mcord/mcord_public_key
 
+    m1.xlarge:
+      type: tosca.nodes.Flavor
 
     Private:
       type: tosca.nodes.NetworkTemplate
@@ -226,11 +228,14 @@
           - default_image:
                 node: mcord-bbu-multi-nic 
                 relationship: tosca.relationships.DefaultImage
+          - default_flavor:
+                node: m1.xlarge
+                relationship: tosca.relationships.DefaultFlavor
           - management:
               node: management
               relationship: tosca.relationships.ConnectsToNetwork
       properties:
           network: noauto
-          default_flavor: m1.xlarge
+#          default_flavor: m1.xlarge
           default_node: computeBBU2 
     
diff --git a/xos/configurations/mcord/setup.yaml b/xos/configurations/mcord/setup.yaml
index e3ea5e4..0dd2769 100644
--- a/xos/configurations/mcord/setup.yaml
+++ b/xos/configurations/mcord/setup.yaml
@@ -12,7 +12,7 @@
     MyDeployment:
       type: tosca.nodes.Deployment
       properties:
-          flavors: m1.large, m1.medium, m1.small
+          flavors: m1.xlarge, m1.large, m1.medium, m1.small
 
     m1.xlarge:
       type: tosca.nodes.Flavor
@@ -57,10 +57,6 @@
     # It's an example of how to create new users
     padmin@vicci.org:
       type: tosca.nodes.User
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.MemberOfSite
       properties:
           is_admin: true
           is_active: true
@@ -68,10 +64,137 @@
           lastname: admin
           password: letmein
       requirements:
+          - site:
+              node: mysite
+              relationship: tosca.relationships.MemberOfSite
           - mcord_dashboard:
               node: Topology
               relationship: tosca.relationships.UsesDashboard
 
+    johndoe@stanford.us:
+      type: tosca.nodes.User
+      properties:
+          is_active: true
+          password: letmein
+          firstname: john
+          lastname: doe
+      requirements:
+          - site:
+              node: mysite
+              relationship: tosca.relationships.MemberOfSite
+    
+    # A subscriber
+    Stanford:
+       type: tosca.nodes.CORDSubscriber
+       properties:
+           service_specific_id: 123
+           firewall_enable: false
+           cdn_enable: false
+           url_filter_enable: false
+           url_filter_level: R
+       requirements:
+          - house_admin:
+              node: johndoe@stanford.us
+              relationship: tosca.relationships.AdminPrivilege
+
+    Barbera Lapinski:
+       type: tosca.nodes.CORDUser
+       properties:
+           mac: 01:02:03:04:05:06
+           level: PG_13
+       requirements:
+           - household:
+               node: Stanford
+               relationship: tosca.relationships.SubscriberDevice
+
+    Norbert Shumway:
+       type: tosca.nodes.CORDUser
+       properties:
+           mac: 90:E2:BA:82:F9:75
+           level: PG_13
+       requirements:
+           - household:
+               node: Stanford
+               relationship: tosca.relationships.SubscriberDevice
+
+    Fay Muldoon:
+       type: tosca.nodes.CORDUser
+       properties:
+           mac: 68:5B:35:9D:91:D5
+           level: PG_13
+       requirements:
+           - household:
+               node: Stanford
+               relationship: tosca.relationships.SubscriberDevice
+
+    Janene Earnest:
+       type: tosca.nodes.CORDUser
+       properties:
+           mac: 34:36:3B:C9:B6:A6
+           level: PG_13
+       requirements:
+           - household:
+               node: Stanford
+               relationship: tosca.relationships.SubscriberDevice
+
+    RRU:
+      type: tosca.nodes.Service
+      properties:
+          view_url: /mcord/?service=vBBU
+          icon_url: /static/mCordServices/service_rru.png
+          kind: RAN
+
+    eSON:
+      type: tosca.nodes.Service
+      properties:
+          icon_url: /static/mCordServices/service_server.png
+          view_url: http://www.google.com
+          kind: RAN
+
+    # EPC
+    vMME:
+      type: tosca.nodes.Service
+      properties:
+          icon_url: /static/mCordServices/service_server.png
+          view_url: /mcord/?service=vMME
+          kind: vEPC
+
+    vSGW:
+      type: tosca.nodes.Service
+      properties:
+          view_url: /mcord/?service=vSGW
+          icon_url: /static/mCordServices/service_server.png
+          kind: vEPC
+
+    vPGW:
+      type: tosca.nodes.Service
+      properties:
+          view_url: /mcord/?service=vPGW
+          icon_url: /static/mCordServices/service_server.png
+          kind: vEPC
+
+    # EDGE
+    Cache:
+      type: tosca.nodes.Service
+      properties:
+          view_url: /mcord/?service=Cache
+          icon_url: /static/mCordServices/service_cache.png
+          kind: EDGE
+
+    Firewall:
+      type: tosca.nodes.Service
+      properties:
+          view_url: /mcord/?service=Firewall
+          icon_url: /static/mCordServices/service_firewall.png
+          kind: EDGE
+
+    Video Optimization:
+      type: tosca.nodes.Service
+      properties:
+          view_url: /mcord/?service=Video%20Optimization
+          icon_url: /static/mCordServices/service_video.png
+          kind: EDGE
+
     RRU:
       type: tosca.nodes.Service
       properties:
diff --git a/xos/configurations/mcord/tosca_tmp/tmp2.yaml b/xos/configurations/mcord/tosca_tmp/tmp2.yaml
index 3c7bf8b..7282945 100644
--- a/xos/configurations/mcord/tosca_tmp/tmp2.yaml
+++ b/xos/configurations/mcord/tosca_tmp/tmp2.yaml
@@ -9,76 +9,8 @@
 topology_template:
   node_templates:
 
-    Stanford_Deployment:
-      type: tosca.nodes.Deployment
-      properties:
-          flavors: m1.large, m1.medium, m1.small
-
-    computeBBU1:
-      type: tosca.nodes.Node
-      requirements:
-        - site:
-            node: Stanford_University
-            relationship: tosca.relationships.MemberOfSite
-        - deployment:
-            node: Stanford_Deployment
-            relationship: tosca.relationships.MemberOfDeployment
-
-    computeBBU2:
-      type: tosca.nodes.Node
-      requirements:
-        - site:
-            node: Stanford_University
-            relationship: tosca.relationships.MemberOfSite
-        - deployment:
-            node: Stanford_Deployment
-            relationship: tosca.relationships.MemberOfDeployment
-
-    McordOpenStack:
-      type: tosca.nodes.Controller
-      requirements:
-          - deployment:
-              node: Stanford_Deployment
-              relationship: tosca.relationships.ControllerDeployment
-      properties:
-          backend_type: OpenStack
-          version: Kilo
-          auth_url: { get_script_env: [ SELF, adminrc, OS_AUTH_URL, LOCAL_FILE] }
-          admin_user: { get_script_env: [ SELF, adminrc, OS_USERNAME, LOCAL_FILE] }
-          admin_password: { get_script_env: [ SELF, adminrc, OS_PASSWORD, LOCAL_FILE] }
-          admin_tenant: { get_script_env: [ SELF, adminrc, OS_TENANT_NAME, LOCAL_FILE] }
-          domain: Default
-      artifacts:
-          adminrc: /root/setup/admin-openrc.sh
-
-    Stanford_University:
-      type: tosca.nodes.Site
-      properties:
-          display_name: Stanford University
-          site_url: http://xosproject.org/
-      requirements:
-          - deployment:
-               node: Stanford_Deployment
-               relationship: tosca.relationships.SiteDeployment
-               requirements:
-                   - controller:
-                       node: McordOpenStack
-                       relationship: tosca.relationships.UsesController
-
     # This user already exists in XOS with this password
     # It's an example of how to create new users
-    padmin@vicci.org:
-      type: tosca.nodes.User
-      requirements:
-          - site:
-              node: Stanford_University
-              relationship: tosca.relationships.MemberOfSite
-      properties:
-          is_admin: true
-          is_active: true
-          firstname: XOS
-          lastname: admin
-          password: letmein
 
     johndoe@stanford.us:
       type: tosca.nodes.User
@@ -86,10 +18,6 @@
           password: letmein
           firstname: john
           lastname: doe
-      requirements:
-          - site:
-              node: Stanford_University
-              relationship: tosca.relationships.MemberOfSite
     
     # A subscriber
     Stanford:
@@ -145,68 +73,3 @@
                node: Stanford
                relationship: tosca.relationships.SubscriberDevice
 
-    RRU:
-      type: tosca.nodes.Service
-      properties:
-          view_url: /mcord/?service=vBBU
-          icon_url: /static/mCordServices/service_rru.png
-          kind: RAN
-    vBBU:
-      type: tosca.nodes.Service
-      properties:
-          view_url: /mcord/?service=vBBU
-          icon_url: /static/mCordServices/service_server.png
-          kind: RAN
-
-    eSON:
-      type: tosca.nodes.Service
-      properties:
-          icon_url: /static/mCordServices/service_server.png
-          view_url: http://www.google.com
-          kind: RAN
-
-    # EPC
-    vMME:
-      type: tosca.nodes.Service
-      properties:
-          icon_url: /static/mCordServices/service_server.png
-          view_url: /mcord/?service=vMME
-          kind: vEPC
-
-    vSGW:
-      type: tosca.nodes.Service
-      properties:
-          view_url: /mcord/?service=vSGW
-          icon_url: /static/mCordServices/service_server.png
-          kind: vEPC
-
-    vPGW:
-      type: tosca.nodes.Service
-      properties:
-          view_url: /mcord/?service=vPGW
-          icon_url: /static/mCordServices/service_server.png
-          kind: vEPC
-
-    # EDGE
-    Cache:
-      type: tosca.nodes.Service
-      properties:
-          view_url: /mcord/?service=Cache
-          icon_url: /static/mCordServices/service_cache.png
-          kind: EDGE
-
-    Firewall:
-      type: tosca.nodes.Service
-      properties:
-          view_url: /mcord/?service=Firewall
-          icon_url: /static/mCordServices/service_firewall.png
-          kind: EDGE
-
-    Video Optimization:
-      type: tosca.nodes.Service
-      properties:
-          view_url: /mcord/?service=Video%20Optimization
-          icon_url: /static/mCordServices/service_video.png
-          kind: EDGE
-
-
diff --git a/xos/core/xoslib/static/js/vendor/ngXosVendor.js b/xos/core/xoslib/static/js/vendor/ngXosVendor.js
index 23bcaae..bf3a62d 100644
--- a/xos/core/xoslib/static/js/vendor/ngXosVendor.js
+++ b/xos/core/xoslib/static/js/vendor/ngXosVendor.js
@@ -65492,7 +65492,6 @@
     root._ = _;
   }
 }.call(this));
-<<<<<<< HEAD
 
 /**
  * @license AngularJS v1.5.5
@@ -66216,5 +66215,3 @@
 
 
 })(window, window.angular);
-=======
->>>>>>> upstream/master
diff --git a/xos/services/mcord/models.py b/xos/services/mcord/models.py
index 5b69d4f..1b2bd65 100644
--- a/xos/services/mcord/models.py
+++ b/xos/services/mcord/models.py
@@ -59,7 +59,7 @@
                        "rru_ip", "rru_mac")
     # default_attributes is used cleanly indicate what the default values for
     # the fields are.
-    default_attributes = {"display_message": "New vBBU Component", "s1u_tag": "201", "s1mme_tag": "200", "rru_tag": "199"}
+    default_attributes = {"display_message": "New vBBU Component", "s1u_tag": "901", "s1mme_tag": "900", "rru_tag": "999"}
     def __init__(self, *args, **kwargs):
         mcord_services = MCORDService.get_service_objects().all()
         # When the tenant is created the default service in the form is set
@@ -169,6 +169,7 @@
     def make_instance(self):
         slice = self.provider_service.slices.all()[0]            
         flavors = Flavor.objects.filter(name=slice.default_flavor)
+#        flavors = Flavor.objects.filter(name="m1.xlarge")
         if not flavors:
             raise XOSConfigurationError("No default flavor")
         default_flavor = slice.default_flavor
diff --git a/xos/services/mcord/view.py b/xos/services/mcord/view.py
index 2da4a24..dc5f06a 100644
--- a/xos/services/mcord/view.py
+++ b/xos/services/mcord/view.py
@@ -2,7 +2,6 @@
 from django.views.generic import TemplateView, View
 from django import template
 from core.models import *
-from services.helloworld.models import *
 import json
 import os
 import time
diff --git a/xos/synchronizers/vbbu/steps/sync_vbbu.yaml b/xos/synchronizers/vbbu/steps/sync_vbbu.yaml
index 344b9de..1e1e258 100644
--- a/xos/synchronizers/vbbu/steps/sync_vbbu.yaml
+++ b/xos/synchronizers/vbbu/steps/sync_vbbu.yaml
@@ -17,4 +17,3 @@
 
   - name: setup rru interface config
     shell: ./start_3gpp_int.sh eth3 {{ rru_tag }} {{ rru_ip }}/24 
-
diff --git a/xos/synchronizers/vbbu/steps/sync_vbbu.yaml.old b/xos/synchronizers/vbbu/steps/sync_vbbu.yaml.old
index 4b392ae..5c46908 100644
--- a/xos/synchronizers/vbbu/steps/sync_vbbu.yaml.old
+++ b/xos/synchronizers/vbbu/steps/sync_vbbu.yaml.old
@@ -9,6 +9,15 @@
   - name: write message
     shell: echo "{{ display_message }}" > /var/tmp/index.html
 
-  - name: setup s1u interface message
-    shell: ifconfig eth1 0.0.0.0; ip link add link eth1 name eth1.{{ s1u_tag }} type vlan id {{ s1u_tag }}; ip a a {{ s1u_ip }}/24 dev eth1.{{ s1u_tag }}; ifconfig eth1 up; ifconfig eth1.{{ s1u_tag }} up
+  - name: setup s1u interface config
+    shell: ./start_3gpp_int.sh eth1 {{ s1u_tag }} {{ s1u_ip }}/24 
+
+  - name: setup s1mme interface config
+    shell: ./start_3gpp_int.sh eth2 {{ s1mme_tag }} {{ s1mme_ip }}/24 
+
+  - name: setup rru interface config
+    shell: ./start_3gpp_int.sh eth3 {{ rru_tag }} {{ rru_ip }}/24 
+
+#  - name: startup bbu
+#    shell: /bin/sh -c /usr/sbin/start_bbu 0
 
diff --git a/xos/tosca/custom_types/xos.m4 b/xos/tosca/custom_types/xos.m4
index dd548da..6fce03b 100644
--- a/xos/tosca/custom_types/xos.m4
+++ b/xos/tosca/custom_types/xos.m4
@@ -776,7 +776,6 @@
                 required: false
                 description: default isolation to use when bringing up instances (default to 'vm')
             network:
-<<<<<<< HEAD
                 type: string
                 required: false
                 description: type of networking to use for this slice
@@ -784,16 +783,7 @@
                 type: string
                 required: false
                 description: comma-separated list of protocol _space_ port that represent ports the slice should expose
-            default_flavor:
-                # Note: we should probably formally introduce flavors to Tosca
-                # at some point, and use a requirement/relationship instead of
-                # a text string.
-                type: string
-                required: false
-                description: default flavor to use for slice
             default_node:
-=======
->>>>>>> upstream/master
                 type: string
                 required: false
                 description: default node to use for this slice
@@ -833,8 +823,6 @@
             flavor:
                 type: tosca.capabilities.xos.Flavor
 
-<<<<<<< HEAD
-=======
     tosca.nodes.SiteRole:
         derived_from: tosca.nodes.Root
         description: >
@@ -875,7 +863,6 @@
             deploymentrole:
                 type: tosca.capabilities.xos.DeploymentRole
 
->>>>>>> upstream/master
     tosca.nodes.DashboardView:
         derived_from: tosca.nodes.Root
         description: >
@@ -1099,8 +1086,6 @@
         derived_from: tosca.capabilities.Root
         description: An XOS Flavor
 
-<<<<<<< HEAD
-=======
     tosca.capabilities.xos.DeploymentRole:
         derived_from: tosca.capabilities.Root
         description: An XOS DeploymentRole
@@ -1117,7 +1102,6 @@
         derived_from: tosca.capabilities.Root
         description: An XOS TenantRole
 
->>>>>>> upstream/master
     tosca.capabilities.xos.Image:
         derived_from: tosca.capabilities.Root
         description: An XOS Image
diff --git a/xos/tosca/custom_types/xos.yaml b/xos/tosca/custom_types/xos.yaml
index 9d25554..83c8340 100644
--- a/xos/tosca/custom_types/xos.yaml
+++ b/xos/tosca/custom_types/xos.yaml
@@ -1268,20 +1268,10 @@
                 required: false
                 description: type of networking to use for this slice
             exposed_ports:
-<<<<<<< HEAD
                 type: string
                 required: false
                 description: comma-separated list of protocol _space_ port that represent ports the slice should expose
-            default_flavor:
-                # Note: we should probably formally introduce flavors to Tosca
-                # at some point, and use a requirement/relationship instead of
-                # a text string.
-                type: string
-                required: false
-                description: default flavor to use for slice
             default_node:
-=======
->>>>>>> upstream/master
                 type: string
                 required: false
                 description: default node to use for this slice
@@ -1354,8 +1344,6 @@
             flavor:
                 type: tosca.capabilities.xos.Flavor
 
-<<<<<<< HEAD
-=======
     tosca.nodes.SiteRole:
         derived_from: tosca.nodes.Root
         description: >
@@ -1440,7 +1428,6 @@
             deploymentrole:
                 type: tosca.capabilities.xos.DeploymentRole
 
->>>>>>> upstream/master
     tosca.nodes.DashboardView:
         derived_from: tosca.nodes.Root
         description: >
@@ -1686,8 +1673,6 @@
         derived_from: tosca.capabilities.Root
         description: An XOS Flavor
 
-<<<<<<< HEAD
-=======
     tosca.capabilities.xos.DeploymentRole:
         derived_from: tosca.capabilities.Root
         description: An XOS DeploymentRole
@@ -1704,7 +1689,6 @@
         derived_from: tosca.capabilities.Root
         description: An XOS TenantRole
 
->>>>>>> upstream/master
     tosca.capabilities.xos.Image:
         derived_from: tosca.capabilities.Root
         description: An XOS Image
diff --git a/xos/xos/settings.py b/xos/xos/settings.py
index c5123da..9f190ce 100644
--- a/xos/xos/settings.py
+++ b/xos/xos/settings.py
@@ -176,11 +176,7 @@
     'core',
     'services.hpc',
     'services.cord',
-<<<<<<< HEAD
     'services.mcord',
-    'services.helloworldservice_complete',
-=======
->>>>>>> upstream/master
     'services.onos',
     'services.ceilometer',
     'services.requestrouter',
diff --git a/xos/xos/urls.py b/xos/xos/urls.py
index 45c0675..b9f2bf1 100644
--- a/xos/xos/urls.py
+++ b/xos/xos/urls.py
@@ -10,13 +10,9 @@
 
 from core.views.legacyapi import LegacyXMLRPC
 from core.views.serviceGraph import ServiceGridView, ServiceGraphView
-<<<<<<< HEAD
-from services.helloworld.view import *
 from services.mcord.view import *
 # from core.views.analytics import AnalyticsAjaxView
 
-=======
->>>>>>> upstream/master
 from core.models import *
 from rest_framework import generics
 from core.dashboard.sites import SitePlus
@@ -64,15 +60,13 @@
 urlpatterns = patterns(
     '',
     url(r'^observer', 'core.views.observer.Observer', name='observer'),
-<<<<<<< HEAD
-    url(r'^helloworld', HelloWorldView.as_view(), name='helloWorld'),
 
     url(r'^mcord', MCordView.as_view(), name='mcord'),
 
     url(r'^serviceGrid', serviceClass(), name='serviceGrid'),
-=======
+
     url(r'^serviceGrid', ServiceGridView.as_view(), name='serviceGrid'),
->>>>>>> upstream/master
+
     url(r'^serviceGraph.png', ServiceGraphView.as_view(), name='serviceGraph'),
     url(r'^hpcConfig', 'core.views.hpc_config.HpcConfig', name='hpcConfig'),